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 @@
*Champs obligatoires
- +
diff --git a/resources/views/front/sable/breadcrumb/layout.blade.php b/resources/views/front/sable/breadcrumb/layout.blade.php index bc403859..feda101f 100644 --- a/resources/views/front/sable/breadcrumb/layout.blade.php +++ b/resources/views/front/sable/breadcrumb/layout.blade.php @@ -1,5 +1,5 @@ @unless ($breadcrumbs->isEmpty()) -
+
@@ -21,5 +21,5 @@
-
+ @endunless diff --git a/resources/views/front/sable/contact.blade.php b/resources/views/front/sable/contact.blade.php index c4aea861..e21b495b 100644 --- a/resources/views/front/sable/contact.blade.php +++ b/resources/views/front/sable/contact.blade.php @@ -6,8 +6,8 @@ @section('breadcrumb', 'no') @section('content') -
-

{!! $content->title !!}

+
+

{!! $content->title !!}

@if ($content !== null) @@ -116,5 +116,5 @@ @endif
-
+ @endsection diff --git a/resources/views/front/sable/customer/dashboard.blade.php b/resources/views/front/sable/customer/dashboard.blade.php index b129a0c3..826df5bd 100644 --- a/resources/views/front/sable/customer/dashboard.blade.php +++ b/resources/views/front/sable/customer/dashboard.blade.php @@ -20,7 +20,7 @@ {{ session('success') }} @endif -

Mon compte

+

Mon compte

@@ -37,7 +37,7 @@
-

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 :

@@ -131,10 +131,19 @@
-

Mot de passe

+

Mot de passe

@csrf
+
+ +
+
+
-

Mes Commandes

-
-
-
- @if(count($orders) > 0) - -
-
Référence
-
Date
-
Total en €
-
Statut
- - @foreach ($orders as $order) -
- {{--Détails--}} -
- -
- {{\Carbon\Carbon::parse($order->date)->format('d/m/Y')}} -
-
@fmt_currency($order->total)
-
{{$order->status->label}}
- @endforeach - @else -

Vous n'avez aucunes commandes

- @endif +
+
+
+

Mes Commandes

+
+
+
+ @if(count($orders) > 0) + + + + + + + + + + + @foreach ($orders as $order) + + + + + + + @endforeach + +
RéférenceDateTotal en €Statut
+ {{$order->reference}} + + {{\Carbon\Carbon::parse($order->date)->format('d/m/Y')}} + @fmt_currency($order->total){{ $order->status->label }}
+ @else +

Vous n'avez aucunes commandes

+ @endif +
+
diff --git a/resources/views/front/sable/customer/order-detail.blade.php b/resources/views/front/sable/customer/order-detail.blade.php index 0bd9dce3..a228a1a8 100644 --- a/resources/views/front/sable/customer/order-detail.blade.php +++ b/resources/views/front/sable/customer/order-detail.blade.php @@ -6,38 +6,72 @@ @section('breadcrumb', request()->route()->getName()) @section('content') -
-

Détail de votre commande du {{\Carbon\Carbon::parse($order->date)->format('d/m/Y')}}

-
-
-
-
Etat de votre commande : {{$order->status->label}}
-
Rappel de votre commande ref: {{ $order->reference }}
- @foreach ($order->lines as $line) -
-
{{ $line->quantity }} x
-
{{ $line->product->name }}
-
{{ $line->formattedTotalTtc }}
+
+
+
+

Détail de votre commande du {{\Carbon\Carbon::parse($order->date)->format('d/m/Y')}}

+

réf: {{ $order->reference }}

+
+
+
+ @if (\Session::has('message')) +
+ {!! \Session::get('message') !!} +
+ @endif + + + + + + + + + + + + + + + + + + + + + + + +
Etat de votre commandeRappel de votre commandePrix au KG TTCPrix à la pièce TTC
+ {{ $order->status->label }} + + @foreach ($order->lines as $line) +

{{ $line->quantity }} x {{ $line->product->name }}

+ @endforeach +
+ @foreach ($order->lines as $line) +

@fmt_currency($line->product->priceKgTtc)

+ @endforeach +
+ @foreach ($order->lines as $line) +

@fmt_currency($line->product->discountedPriceTtc)

+ @endforeach +
+ Total estimé TTC + {{ $order->formattedTotalTtc }} +
+ @if (!empty($order->timeslot)) +

+ A retirer le {{$order->timeslot->day}} à {{$order->timeslot->time}}, à l'adresse suivante :
+ Mon point de retrait {{$magasin->name}}, {{$magasin->address}}, {{$magasin->postcode}} {{$magasin->city}} +

+ @else + + @endif
- @endforeach -
-
Total
-
{{ $order->formattedTotalTtc }}
- @if (!empty($order->timeslot)) -
- A retirer le {{$order->timeslot->day}} à {{$order->timeslot->time}}, à l’adresse suivante :
- Mon point de retrait {{$magasin->name}}, {{$magasin->address}}, {{$magasin->postcode}} {{$magasin->city}} -
- @else - - @endif - - - - {{--Voir l'itinéraire--}}
diff --git a/resources/views/front/sable/faq.blade.php b/resources/views/front/sable/faq.blade.php index 553d1422..625f8e65 100644 --- a/resources/views/front/sable/faq.blade.php +++ b/resources/views/front/sable/faq.blade.php @@ -6,10 +6,10 @@ @section('breadcrumb', 'no') @section('content') -
+
+ @endsection diff --git a/resources/views/front/sable/home.blade.php b/resources/views/front/sable/home.blade.php index 43da3a43..fcbe088d 100644 --- a/resources/views/front/sable/home.blade.php +++ b/resources/views/front/sable/home.blade.php @@ -6,49 +6,38 @@ @section('breadcrumb', 'no') @section('content') - - - -
- +
+

Offres

@foreach ($products as $product)
-
-
-
+
+
+

bientôt disponible

picture) }}" class="h-100 mw-100" alt="{{ $product->name }}">
-
+
{{ $product->name }}
-
- @if ($product->promotions->count()) - @fmt_currency_without_ttc($product->priceTtc) - @endif - @fmt_currency_without_ttc($product->discountedPriceTtc) +
+ {!! $product->description !!}
- @if ($product->weight_variable) -

*Prix variable en fonction du poids

- @endif +
+ {{-- @if ($product->promotions->count()) + @fmt_currency_without_ttc($product->priceTtc) + @endif --}} +

+ @if ($product->weight_variable) Environ* @endif + @fmt_currency($product->discountedPriceTtc) + /{{ $product->sell_unit }} +

+
+

*Produit vendu au kilo : @fmt_currency($product->priceKgTtc)/kg

@can('addToCart', $product) @@ -62,10 +51,10 @@
@endforeach
-
-
+
+
- voir toutes les offres + voir toutes les offres
@@ -80,10 +69,10 @@ ...
-
+
{{ $quickorder_range->name }}
{!! $quickorder_range->description !!} - Voir le rayon + Voir le rayon
@@ -94,84 +83,85 @@ voir tous les rayons -
-

Services

-
-
-
- Illustration d'un 'large choix' -
-
Sélectionner
-

vos produits en ligne

-
-
-
-
- Illustration des 'économies' -
-
-
- Illustration de 'pratique et rapide' -
-
Choisissez
-

votre créneau horaire

-
-
-
-
- Illustration de 'fraicheur et qualité' -
-
-
- Illustration de 'pratique et rapide' -
-
Retirez
-

votre commande

-
-
-
-
- -
-
-
- Illustration d'un 'large choix' -
-
Un large choix
-

Des produits de qualité, des préparations variées, des quantités adaptées...

+
+

Services

+
+
+
+ Illustration d'un 'large choix' +
+
Sélectionner
+

vos produits en ligne

+
+
+
+
+ Illustration des 'économies' +
+
+
+ Illustration de 'pratique et rapide' +
+
Choisissez
+

votre créneau horaire

+
+
+
+
+ Illustration de 'fraicheur et qualité' +
+
+
+ Illustration de 'pratique et rapide' +
+
Retirez
+

votre commande

+
-
-
- Illustration des 'économies' -
-
Des économies
-

Profitez encore plus de nos produits gourmands en achetant en direct

+ + +
+
+
+ Illustration d'un 'large choix' +
+
Un large choix
+

Des produits de qualité, des préparations variées, des quantités adaptées...

+
+
+
+
+
+ Illustration des 'économies' +
+
Des économies
+

Profitez encore plus de nos produits gourmands en achetant en direct

+
+
+
+
+
+ Illustration de 'pratique et rapide' +
+
Pratique et rapide
+

Quoi de mieux que la commande en ligne pour gagner du temps ?

+
+
+
+
+
+ Illustration de 'fraicheur et qualité' +
+
Fraicheur & Qualité
+

Votre commande est préparée avec soin, dans le plus grand respect de la chaîne du froid

+
-
-
- Illustration de 'pratique et rapide' -
-
Pratique et rapide
-

Quoi de mieux que la commande en ligne pour gagner du temps ?

-
-
-
-
-
- Illustration de 'fraicheur et qualité' -
-
Fraicheur & Qualité
-

Votre commande est préparée avec soin, dans le plus grand respect de la chaîne du froid

-
-
-
-
-
-
+ + @endsection diff --git a/resources/views/front/sable/img/accordeon__arrow.png b/resources/views/front/sable/img/accordeon__arrow.png deleted file mode 100644 index 536efb2f..00000000 Binary files a/resources/views/front/sable/img/accordeon__arrow.png and /dev/null differ diff --git a/resources/views/front/sable/img/arrow_next.png b/resources/views/front/sable/img/arrow_next.png deleted file mode 100644 index b864ecc4..00000000 Binary files a/resources/views/front/sable/img/arrow_next.png and /dev/null differ diff --git a/resources/views/front/sable/img/arrow_prev.png b/resources/views/front/sable/img/arrow_prev.png deleted file mode 100644 index f6590bf9..00000000 Binary files a/resources/views/front/sable/img/arrow_prev.png and /dev/null differ diff --git a/resources/views/front/sable/img/chevron_down.svg b/resources/views/front/sable/img/chevron_down.svg deleted file mode 100644 index cd70fc51..00000000 --- a/resources/views/front/sable/img/chevron_down.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/resources/views/front/sable/img/chevron_next.svg b/resources/views/front/sable/img/chevron_next.svg index cc8172b1..1d115481 100644 --- a/resources/views/front/sable/img/chevron_next.svg +++ b/resources/views/front/sable/img/chevron_next.svg @@ -1,7 +1,11 @@ - - - - + + + + + + diff --git a/resources/views/front/sable/img/chevron_prev.svg b/resources/views/front/sable/img/chevron_prev.svg index 4405c73a..149431f6 100644 --- a/resources/views/front/sable/img/chevron_prev.svg +++ b/resources/views/front/sable/img/chevron_prev.svg @@ -1,7 +1,11 @@ - - - - + + + + + + diff --git a/resources/views/front/sable/img/chevron_up.svg b/resources/views/front/sable/img/chevron_up.svg deleted file mode 100644 index 6841cb59..00000000 --- a/resources/views/front/sable/img/chevron_up.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - diff --git a/resources/views/front/sable/img/default-banner.jpg b/resources/views/front/sable/img/default-banner.jpg deleted file mode 100644 index 127e669f..00000000 Binary files a/resources/views/front/sable/img/default-banner.jpg and /dev/null differ diff --git a/resources/views/front/sable/img/default-slider.jpg b/resources/views/front/sable/img/default-slider.jpg deleted file mode 100644 index 9875df88..00000000 Binary files a/resources/views/front/sable/img/default-slider.jpg and /dev/null differ diff --git a/resources/views/front/sable/img/demo/recipe_1.png b/resources/views/front/sable/img/demo/recipe_1.png deleted file mode 100644 index 81f2ae47..00000000 Binary files a/resources/views/front/sable/img/demo/recipe_1.png and /dev/null differ diff --git a/resources/views/front/sable/img/header/automne - Copie.jpg b/resources/views/front/sable/img/header/automne - Copie.jpg deleted file mode 100644 index deb9f0e5..00000000 Binary files a/resources/views/front/sable/img/header/automne - Copie.jpg and /dev/null differ diff --git a/resources/views/front/sable/img/header/automne-grand.jpg b/resources/views/front/sable/img/header/automne-grand.jpg deleted file mode 100644 index 6d4ecb19..00000000 Binary files a/resources/views/front/sable/img/header/automne-grand.jpg and /dev/null differ diff --git a/resources/views/front/sable/img/header/automne.jpg b/resources/views/front/sable/img/header/automne.jpg deleted file mode 100644 index deb9f0e5..00000000 Binary files a/resources/views/front/sable/img/header/automne.jpg and /dev/null differ diff --git a/resources/views/front/sable/img/header/bg-repeat.jpg b/resources/views/front/sable/img/header/bg-repeat.jpg deleted file mode 100644 index 794d105c..00000000 Binary files a/resources/views/front/sable/img/header/bg-repeat.jpg and /dev/null differ diff --git a/resources/views/front/sable/img/header/ete - Copie.jpg b/resources/views/front/sable/img/header/ete - Copie.jpg deleted file mode 100644 index ac4b2908..00000000 Binary files a/resources/views/front/sable/img/header/ete - Copie.jpg and /dev/null differ diff --git a/resources/views/front/sable/img/header/ete-grand.jpg b/resources/views/front/sable/img/header/ete-grand.jpg deleted file mode 100644 index 6627e5a0..00000000 Binary files a/resources/views/front/sable/img/header/ete-grand.jpg and /dev/null differ diff --git a/resources/views/front/sable/img/header/ete.jpg b/resources/views/front/sable/img/header/ete.jpg deleted file mode 100644 index ac4b2908..00000000 Binary files a/resources/views/front/sable/img/header/ete.jpg and /dev/null differ diff --git a/resources/views/front/sable/img/header/header - Copie.jpg b/resources/views/front/sable/img/header/header - Copie.jpg deleted file mode 100644 index 9b0f231e..00000000 Binary files a/resources/views/front/sable/img/header/header - Copie.jpg and /dev/null differ diff --git a/resources/views/front/sable/img/header/header-all.png b/resources/views/front/sable/img/header/header-all.png deleted file mode 100644 index 4663c092..00000000 Binary files a/resources/views/front/sable/img/header/header-all.png and /dev/null differ diff --git a/resources/views/front/sable/img/header/header.jpg b/resources/views/front/sable/img/header/header.jpg deleted file mode 100644 index 9b0f231e..00000000 Binary files a/resources/views/front/sable/img/header/header.jpg and /dev/null differ diff --git a/resources/views/front/sable/img/header/hiver.jpg b/resources/views/front/sable/img/header/hiver.jpg deleted file mode 100644 index 6277f21b..00000000 Binary files a/resources/views/front/sable/img/header/hiver.jpg and /dev/null differ diff --git a/resources/views/front/sable/img/header/printemps-grand.jpg b/resources/views/front/sable/img/header/printemps-grand.jpg deleted file mode 100644 index 2ad75e6e..00000000 Binary files a/resources/views/front/sable/img/header/printemps-grand.jpg and /dev/null differ diff --git a/resources/views/front/sable/img/header/printemps.jpg b/resources/views/front/sable/img/header/printemps.jpg deleted file mode 100644 index 98b89d9d..00000000 Binary files a/resources/views/front/sable/img/header/printemps.jpg and /dev/null differ diff --git a/resources/views/front/sable/img/icon_cart-white.png b/resources/views/front/sable/img/icon_cart-white.png deleted file mode 100644 index bc78f8dd..00000000 Binary files a/resources/views/front/sable/img/icon_cart-white.png and /dev/null differ diff --git a/resources/views/front/sable/img/icon_cart.png b/resources/views/front/sable/img/icon_cart.png deleted file mode 100644 index 166e6742..00000000 Binary files a/resources/views/front/sable/img/icon_cart.png and /dev/null differ diff --git a/resources/views/front/sable/img/icon_date.jpg b/resources/views/front/sable/img/icon_date.jpg deleted file mode 100644 index 7beb3a79..00000000 Binary files a/resources/views/front/sable/img/icon_date.jpg and /dev/null differ diff --git a/resources/views/front/sable/img/icon_date.png b/resources/views/front/sable/img/icon_date.png deleted file mode 100644 index 9f9c47c4..00000000 Binary files a/resources/views/front/sable/img/icon_date.png and /dev/null differ diff --git a/resources/views/front/sable/img/icon_profile.png b/resources/views/front/sable/img/icon_profile.png deleted file mode 100644 index df4563c9..00000000 Binary files a/resources/views/front/sable/img/icon_profile.png and /dev/null differ diff --git a/resources/views/front/sable/img/icon_search.png b/resources/views/front/sable/img/icon_search.png deleted file mode 100644 index 98b25024..00000000 Binary files a/resources/views/front/sable/img/icon_search.png and /dev/null differ diff --git a/resources/views/front/sable/img/menu-arrow.png b/resources/views/front/sable/img/menu-arrow.png deleted file mode 100644 index 4659f39a..00000000 Binary files a/resources/views/front/sable/img/menu-arrow.png and /dev/null differ diff --git a/resources/views/front/sable/img/nav_next.png b/resources/views/front/sable/img/nav_next.png deleted file mode 100644 index b3300ba1..00000000 Binary files a/resources/views/front/sable/img/nav_next.png and /dev/null differ diff --git a/resources/views/front/sable/img/nav_prev.png b/resources/views/front/sable/img/nav_prev.png deleted file mode 100644 index 8ea764d5..00000000 Binary files a/resources/views/front/sable/img/nav_prev.png and /dev/null differ diff --git a/resources/views/front/sable/img/p-benefit_1.png b/resources/views/front/sable/img/p-benefit_1.png deleted file mode 100644 index 0773a226..00000000 Binary files a/resources/views/front/sable/img/p-benefit_1.png and /dev/null differ diff --git a/resources/views/front/sable/img/p-benefit_2.png b/resources/views/front/sable/img/p-benefit_2.png deleted file mode 100644 index c2c8c6b4..00000000 Binary files a/resources/views/front/sable/img/p-benefit_2.png and /dev/null differ diff --git a/resources/views/front/sable/img/p-benefit_3.png b/resources/views/front/sable/img/p-benefit_3.png deleted file mode 100644 index 4c432e00..00000000 Binary files a/resources/views/front/sable/img/p-benefit_3.png and /dev/null differ diff --git a/resources/views/front/sable/img/pl_nophoto.png b/resources/views/front/sable/img/pl_nophoto.png index dc848430..b0210bc0 100644 Binary files a/resources/views/front/sable/img/pl_nophoto.png and b/resources/views/front/sable/img/pl_nophoto.png differ diff --git a/resources/views/front/sable/img/pointer.svg b/resources/views/front/sable/img/pointer.svg new file mode 100644 index 00000000..e76bbd6e --- /dev/null +++ b/resources/views/front/sable/img/pointer.svg @@ -0,0 +1,13 @@ + + + + + + + + diff --git a/resources/views/front/sable/img/steps-arrow.png b/resources/views/front/sable/img/steps-arrow.png deleted file mode 100644 index 24c70098..00000000 Binary files a/resources/views/front/sable/img/steps-arrow.png and /dev/null differ diff --git a/resources/views/front/sable/img/white-arrow.png b/resources/views/front/sable/img/white-arrow.png deleted file mode 100644 index 28d063a7..00000000 Binary files a/resources/views/front/sable/img/white-arrow.png and /dev/null differ diff --git a/resources/views/front/sable/js/app.js b/resources/views/front/sable/js/app.js index c0abc6d1..a30fde84 100644 --- a/resources/views/front/sable/js/app.js +++ b/resources/views/front/sable/js/app.js @@ -7,7 +7,7 @@ import { LdcwebCn } from "./vendor/ldcweb-cookies.js"; import './utilities/bootstrap'; import './utilities/swiper'; import './utilities/simplebar'; -import './fo/cart'; +import './fo/common'; // Ldcweb cookies window.LdcwebCn = LdcwebCn; diff --git a/resources/views/front/sable/js/components/BasketButtons.vue b/resources/views/front/sable/js/components/BasketButtons.vue index 558490ec..98046564 100644 --- a/resources/views/front/sable/js/components/BasketButtons.vue +++ b/resources/views/front/sable/js/components/BasketButtons.vue @@ -1,5 +1,5 @@
+
- {{ qttyInCart }} @@ -72,6 +72,13 @@ foundQtty = element.cartItem.qty; } }); + if(this.$el.closest('.card')) { + if(foundQtty) { + this.$el.closest('.card').classList.add("card-activate"); + } else { + this.$el.closest('.card').classList.remove("card-activate"); + } + } return foundQtty; } } diff --git a/resources/views/front/sable/js/components/BasketPanel.vue b/resources/views/front/sable/js/components/BasketPanel.vue index 2d853968..4462ebae 100644 --- a/resources/views/front/sable/js/components/BasketPanel.vue +++ b/resources/views/front/sable/js/components/BasketPanel.vue @@ -1,5 +1,5 @@ - - - diff --git a/resources/views/front/sable/js/components/TimeSlotPicker.vue b/resources/views/front/sable/js/components/TimeSlotPicker.vue index d7b977e2..650fd918 100644 --- a/resources/views/front/sable/js/components/TimeSlotPicker.vue +++ b/resources/views/front/sable/js/components/TimeSlotPicker.vue @@ -6,19 +6,19 @@ Votre point de retrait
-
+
-
- ... +
+ ...
-
-
{{ magasin.name }}
-

{{ magasin.address }}

-

{{ magasin.postcode }} {{ magasin.city }}

-

{{ magasin.phone }}

-
+
+
{{ magasin.name }}
+

{{ magasin.address }}

+

{{ magasin.postcode }} {{ magasin.city }}

+

{{ magasin.phone }}

+
@@ -26,13 +26,21 @@

- 2. - Choisissez le jour du retrait de votre commande + 2. + Choisissez le jour du retrait de votre commande

-

{{ months[currentmonth] }} {{ currentyear }}

+

+ + + + {{ months[currentmonth] }} {{ currentyear }} + + + +

{{ short(day) }}
@@ -46,17 +54,17 @@

- 3. - Choisissez l'heure du retrait de votre commande + 3. + Choisissez l'heure du retrait de votre commande

-
+
-
-
{{ creneau.horaire }}
-
+
+
{{ creneau.horaire }}
+
@@ -108,25 +116,6 @@ export default { type: Number, default : 34 //soit 5 semaines }, - // defaultCreneaux: { - // type: Array, - // default: function() { - // var x = 15; //minutes interval - // var times = []; // time array - // var tt = 0; // start time - // var ap = ['AM', 'PM']; // AM-PM - - // //loop to increment the time and push results in array - // for (var i=0;tt<24*60; i++) { - // var hh = Math.floor(tt/60); // getting hours of day in 0-24 format - // var mm = (tt%60); // getting minutes of the hour in 0-55 format - // times[i] = ("0" + hh).slice(-2) + ':' + ("0" + mm).slice(-2) //+ ap[Math.floor(hh/12)]; // pushing data in array in [00:00 - 12:00 AM/PM format] - // tt = tt + x; - // } - - // return times; - // } - // }, dbavailablecreneaux: { type: String, }, @@ -139,9 +128,9 @@ export default { }, }, computed: { - date() { return new Date(this.currentyear, this.currentmonth, 1);}, - startday() {return this.date.getDay() < 1 ? 6 : this.date.getDay() - 1;}, - dayscount() {return new Date(this.currentyear, this.currentmonth + 1, 0).getDate();}, + date() { return new Date(this.currentyear, this.currentmonth, 1); }, + startday() { return this.date.getDay() < 1 ? 6 : this.date.getDay() - 1; }, + dayscount() { return new Date(this.currentyear, this.currentmonth + 1, 0).getDate(); }, tiles() { return this.prepare(); }, creneaux: { get: function(){ return this.listCreneaux(); }, @@ -151,21 +140,20 @@ export default { return { currentmonth: null, currentyear: this.year, - selectedDay : new Date().toLocaleDateString(), + selectedDay: new Date().toLocaleDateString(), selectedCreneau : null, current: new Date(), availableCreneaux: [], scrollCounter: 0, - interval:false, + interval: false, magasin: {}, selectedmagasin: null, } }, mounted() { this.availableCreneaux = JSON.parse(this.dbavailablecreneaux); - //this.availableCrenaux = this.dbavailablecreneaux; this.selectedDay = this.current.toLocaleDateString(); - this.currentmonth = this.month; //this.months.indexOf(this.month); + this.currentmonth = this.month; this.magasin = JSON.parse(this.dbmagasin); this.loadAvailableCreneaux(); this.choosemagasin(this.magasin.id); @@ -176,7 +164,7 @@ export default { this.currentmonth = 0; this.currentyear += 1; } else { - this.currentmonth+=1; + this.currentmonth += 1; } }, prevMonth() { @@ -202,7 +190,7 @@ export default { 'last': tile.last, 'next': tile.next, 'current': tile.current, - 'selected' : tile.selected, + 'selected': tile.selected, 'grey': tile.grey, 'unavailable': tile.unavailable } @@ -234,7 +222,7 @@ export default { //this tile's date date: date, //not available - unavailable: (new Date(this.current.getFullYear(), this.current.getMonth(), this.current.getDate()) > date) ? true : false, + unavailable: ((new Date(this.current.getFullYear(), this.current.getMonth(), this.current.getDate()) > date) || this.checkNoCren(date)) ? true : false, }; if (i < this.startday) before.push(obj); @@ -245,6 +233,12 @@ export default { } return before.reverse().concat(current); }, + checkNoCren(date) { + if(this.availableCreneaux[date.toLocaleDateString()]) { + return this.availableCreneaux[date.toLocaleDateString()].length ? false : true; + } + return true; + }, showCreneaux(tile){ if(!tile.unavailable) { this.selectedDay = tile.date.toLocaleDateString(); @@ -255,8 +249,8 @@ export default { this.prevMonth(); } } - //this.selectedCreneau = null; - //this.creneaux = this.listCreneaux(); + this.selectedCreneau = null; + this.creneaux = this.listCreneaux(); }, selectSlot(creneau){ if(creneau.dispo) { @@ -264,28 +258,27 @@ export default { } }, listCreneaux() { - let todaysAvailable = []; - if(this.selectedDay in this.availableCreneaux) { - todaysAvailable = this.availableCreneaux["" + this.selectedDay]; - } - let crens = []; - todaysAvailable.forEach(element => { - let obj = { - //day: index, - horaire: element[0], - dispo: element[1], - selected: (this.selectedCreneau == this.selectedDay + "-" + element[0]) ? true : false - }; - //option pour ne générer que les créneaux disponibles - if(this.showOnlyAvailables) { - if (obj.dispo) { - crens.push(obj); - } - } else { + let todaysAvailable = []; + if(this.selectedDay in this.availableCreneaux) { + todaysAvailable = this.availableCreneaux["" + this.selectedDay]; + } + let crens = []; + todaysAvailable.forEach(element => { + let obj = { + horaire: element[0], + dispo: element[1], + selected: (this.selectedCreneau == this.selectedDay + "-" + element[0]) ? true : false + }; + //option pour ne générer que les créneaux disponibles + if(this.showOnlyAvailables) { + if (obj.dispo) { crens.push(obj); } - }); - return crens; + } else { + crens.push(obj); + } + }); + return crens; }, scrollStart(way) { this.interval = setInterval(() => { @@ -341,7 +334,7 @@ export default { }, loadAvailableCreneaux() { if(this.selectedmagasin != null) { - document.querySelector(".datetime-collect").show(); + document.querySelector(".datetime-collect").display = "block"; axios.post('/ajax/get-time-slots', { id: this.selectedmagasin, }).then( @@ -356,7 +349,7 @@ export default { this.processing = false; }); } else { - document.querySelector(".datetime-collect").hide(); + document.querySelector(".datetime-collect").display = "none"; } } } diff --git a/resources/views/front/sable/js/fo/cart.js b/resources/views/front/sable/js/fo/cart.js deleted file mode 100644 index d3526d6c..00000000 --- a/resources/views/front/sable/js/fo/cart.js +++ /dev/null @@ -1,38 +0,0 @@ -window.showModalClearCart = function() { - $('#empty-basket-modal > div.modal').show(); -} - -window.closeModalClearCart = function() { - $('#empty-basket-modal > div.modal').hide(); -} - -/* ----- BASKET ----- */ -document.addEventListener("DOMContentLoaded", function() { - var basket = document.getElementById("basket"); - var basketEmpty = document.querySelector(".basket-empty") - var basketPreview = document.querySelector(".basket-preview"); - var basketBtn = document.querySelector("#navbar .btn-navbar"); - var basketCross = document.querySelector("#basket .icon-cross"); - - if (basket) - basket.addEventListener("click", (e) => { - if (basketEmpty.style.display == "none") { - if (e.pageX < basketPreview.offsetLeft) { - showBasket(); - } else if(e.pageX > (basketPreview.offsetLeft + basketPreview.clientWidth)) { - showBasket(); - } else if(e.pageY > (basketPreview.offsetTop + basketPreview.clientHeight)) { - showBasket(); - } - } - }) - - if (basketBtn) - basketBtn.addEventListener("click", showBasket); - if (basketCross) - basketCross.addEventListener("click", showBasket); - - function showBasket() { - basket.classList.toggle("basket-hidden"); - } -}); diff --git a/resources/views/front/sable/js/fo/common.js b/resources/views/front/sable/js/fo/common.js new file mode 100644 index 00000000..33057b00 --- /dev/null +++ b/resources/views/front/sable/js/fo/common.js @@ -0,0 +1,68 @@ +window.showModalClearCart = function() { + $('#empty-basket-modal > div.modal').show(); +} + +window.closeModalClearCart = function() { + $('#empty-basket-modal > div.modal').hide(); +} + +document.addEventListener("DOMContentLoaded", function () { + /* ----- SALES ----- */ + var btnCross = document.querySelectorAll("#command .btn-cross"); + if (btnCross.length > 0) { + for (let i = 0 ; i < btnCross.length ; i ++) { + btnCross[i].addEventListener("click", () => { + console.log(btnCross[i].value) + axios.post('/ajax/remove-from-cart', { + rowId: btnCross[i].value, + instance: 'panier', + }).then( + (response) => { + location.reload() + } + ) + .catch(function (error) { + console.log(error); + this.response = "Erreur lors de la modification du panier."; + this.processing = false; + }); + }); + } + } + + /* ----- BASKET ----- */ + var basket = document.getElementById("basket"); + var basketBtn = document.querySelector("#navbar .btn-navbar"); + var basketCross = document.querySelector("#basket .icon-cross"); + + if (basket) + basket.addEventListener("click", (e) => { + var basketPreview = document.querySelector(".basket-preview"); + var basketEmpty = document.querySelector(".basket-empty") + if (basketEmpty.style.display == "none") { + if (e.clientX < basketPreview.offsetLeft || + e.clientX > (basketPreview.offsetLeft + basketPreview.clientWidth) || + e.clientY > (basketPreview.offsetTop + basketPreview.clientHeight)) { + showBasket(); + } + } + }) + + if (basketBtn) + basketBtn.addEventListener("click", showBasket); + if (basketCross) + basketCross.addEventListener("click", showBasket); + + function showBasket() { + basket.classList.toggle("basket-hidden"); + } + + /* ----- MENU ----- */ + var navCollapse = document.querySelector(".navbar-collapse"); + var navLink = navCollapse.querySelectorAll(".nav-link"); + navLink.forEach(element => { + element.addEventListener("click", () => { + navCollapse.classList.remove("show"); + }) + }); +}); diff --git a/resources/views/front/sable/js/utilities/swiper.js b/resources/views/front/sable/js/utilities/swiper.js index 4b2696c7..a2db0acb 100644 --- a/resources/views/front/sable/js/utilities/swiper.js +++ b/resources/views/front/sable/js/utilities/swiper.js @@ -14,15 +14,12 @@ $(document).ready(function(){ enabled: true, onlyInViewport: false, }, - mousewheel: { - invert: true, - }, autoplay: { delay: 5000, - }, + } }); - if (window.matchMedia("(min-width: 768px)").matches) { + if (window.matchMedia("(min-width: 992px)").matches) { var itemsPerView = 3; } else { var itemsPerView = 1; @@ -39,9 +36,6 @@ $(document).ready(function(){ keyboard: { enabled: true, onlyInViewport: false, - }, - mousewheel: { - invert: true, - }, + } }); }); diff --git a/resources/views/front/sable/layouts/footer.blade.php b/resources/views/front/sable/layouts/footer.blade.php index f893aa2d..9102c224 100644 --- a/resources/views/front/sable/layouts/footer.blade.php +++ b/resources/views/front/sable/layouts/footer.blade.php @@ -15,7 +15,7 @@ Mentions légales & CGU
  • - Politique de confidentialité + Charte de confidentialité
  • FAQ diff --git a/resources/views/front/sable/layouts/layout.blade.php b/resources/views/front/sable/layouts/layout.blade.php index a6cfb916..ebb566cc 100644 --- a/resources/views/front/sable/layouts/layout.blade.php +++ b/resources/views/front/sable/layouts/layout.blade.php @@ -6,8 +6,12 @@ @include('layouts.basket') - @include('breadcrumb.breadcrumb-body') - @yield('content') + @include('partials.home-slider') + +
    + @include('breadcrumb.breadcrumb-body') + @yield('content') +
    @include('layouts.footer')
  • diff --git a/resources/views/front/sable/layouts/navbar.blade.php b/resources/views/front/sable/layouts/navbar.blade.php index dc470c98..af833308 100644 --- a/resources/views/front/sable/layouts/navbar.blade.php +++ b/resources/views/front/sable/layouts/navbar.blade.php @@ -11,40 +11,44 @@
    - - - + @if (!Route::is('products')) +
    + +
    + @endif
    - + diff --git a/resources/views/front/sable/legal-notice.blade.php b/resources/views/front/sable/legal-notice.blade.php index 8ad4ba64..9a9274f3 100644 --- a/resources/views/front/sable/legal-notice.blade.php +++ b/resources/views/front/sable/legal-notice.blade.php @@ -6,10 +6,10 @@ @section('breadcrumb', 'no') @section('content') -
    +
    + @endsection diff --git a/resources/views/front/sable/mails/order-confirm.blade.php b/resources/views/front/sable/mails/order-confirm.blade.php index 9b59a2d2..81a0293d 100644 --- a/resources/views/front/sable/mails/order-confirm.blade.php +++ b/resources/views/front/sable/mails/order-confirm.blade.php @@ -94,7 +94,7 @@ - + + +
    + +
    +
    + A retirer le {{$order->timeslot->day}} à {{$order->timeslot->time}}, à l’adresse suivante :

    Mon point de retrait {{$magasin->name}}, {{$magasin->address}}, {{$magasin->postcode}} {{$magasin->city}}
    -


    L'équipe {{ config('theme.site_name') }}
    +
    +
    L'équipe {{ config('theme.site_name') }}
    diff --git a/resources/views/front/sable/mails/order-status.blade.php b/resources/views/front/sable/mails/order-status.blade.php index c554fd5e..c7e112ec 100644 --- a/resources/views/front/sable/mails/order-status.blade.php +++ b/resources/views/front/sable/mails/order-status.blade.php @@ -94,7 +94,7 @@ - + + + + + + + + + @@ -249,7 +290,8 @@ @if (!empty($order->timeslot)) @@ -257,7 +299,8 @@ @endif
    +
    +

    *Produit vendu au kilo. Le prix sera recalculé en fonction du poids du produit livré lors de la remise de votre commande. + Le prix est donc susceptible de varier sur votre facture.

    +
    +

    NB: Nous faisons le maximum pour vous livrer l'intégralité de votre commande, malheureusement certains produits peuvent + être en rupture. Vous ne serez pas facturé des produits non livrés.
    + Pour toutes questions contactez-nous.

    +
    +

    +

    + +
    -
    Total de la commande : @fmt_currency($order->total)
    +
    + Total estimé de la commande : @fmt_currency($order->total) TTC +
    -
    A retirer le {{$order->timeslot->day}} à {{$order->timeslot->time}}, à l’adresse suivante :

    +
    + A retirer le {{$order->timeslot->day}} à {{$order->timeslot->time}}, à l’adresse suivante :

    Mon point de retrait {{$magasin->name}}, {{$magasin->address}}, {{$magasin->postcode}} {{$magasin->city}}
    -


    L'équipe {{ config('theme.site_name') }}
    +
    +
    L'équipe {{ config('theme.site_name') }}
    diff --git a/resources/views/front/sable/partials/cookie.blade.php b/resources/views/front/sable/partials/cookie.blade.php index 3a313456..013c4772 100644 --- a/resources/views/front/sable/partials/cookie.blade.php +++ b/resources/views/front/sable/partials/cookie.blade.php @@ -21,7 +21,7 @@

    {{ Config::get('theme.site_name') }} utilise des cookies !

    -

    Si vous refusez l'utilisation des cookies, vos informations ne seront pas suivies lors de votre visite sur ce site. Un cookie sera utilisé - dans votre navigateur afin de se souvenir de ne pas suivre vos préférences. Certaines fonctionnalités ne seront pas accessibles. - Vous pouvez changer d'avis et modifier votre consentement à tout moment en revenant sur ce site. + dans votre navigateur afin de se souvenir de ne pas suivre vos préférences. Certaines fonctionnalités ne seront pas accessibles. Vous pouvez changer d'avis et modifier votre consentement à tout moment en revenant sur ce site. Pour en savoir plus sur les cookies que nous utilisons, consultez notre charte de confidentialité.

    diff --git a/resources/views/front/sable/partials/home-slider.blade.php b/resources/views/front/sable/partials/home-slider.blade.php new file mode 100644 index 00000000..aa03c521 --- /dev/null +++ b/resources/views/front/sable/partials/home-slider.blade.php @@ -0,0 +1,17 @@ + +@if (Route::is('home')) + +@endif diff --git a/resources/views/front/sable/partials/tunnel-actions.blade.php b/resources/views/front/sable/partials/tunnel-actions.blade.php index 517c272b..f758ec43 100644 --- a/resources/views/front/sable/partials/tunnel-actions.blade.php +++ b/resources/views/front/sable/partials/tunnel-actions.blade.php @@ -1,6 +1,6 @@
    @if ( $activestep < 3 ) - ⟵ Continuer mes achats + ⟵ Continuer mes achats @endif @if ( $activestep == 1 )
    diff --git a/resources/views/front/sable/partials/tunnel-stepper.blade.php b/resources/views/front/sable/partials/tunnel-stepper.blade.php index 0d666595..481d68a6 100644 --- a/resources/views/front/sable/partials/tunnel-stepper.blade.php +++ b/resources/views/front/sable/partials/tunnel-stepper.blade.php @@ -1,7 +1,7 @@
    - + ⟵
    1 ? "step-done" : "") }}">
    diff --git a/resources/views/front/sable/privacy.blade.php b/resources/views/front/sable/privacy.blade.php index d76df556..a6504bff 100644 --- a/resources/views/front/sable/privacy.blade.php +++ b/resources/views/front/sable/privacy.blade.php @@ -6,10 +6,10 @@ @section('breadcrumb', 'no') @section('content') -
    +
    + @endsection diff --git a/resources/views/front/sable/product.blade.php b/resources/views/front/sable/product.blade.php index 513f514e..37b7af21 100644 --- a/resources/views/front/sable/product.blade.php +++ b/resources/views/front/sable/product.blade.php @@ -1,12 +1,12 @@ -@extends('layouts.layout') +@extends('layouts.layout',['brParam' => $product]) @section('title', __('Produit spécifique')) @section('description', 'Produit spécifique de la boutique.') -@section('breadcrumb', 'no') +@section('breadcrumb', request()->route()->getName()) @section('content') -
    +
    @@ -35,21 +35,27 @@
    - foodProduct->nutriscore . ".png") }}"> + @if (isset($product->foodProduct->nutriscore)) + foodProduct->nutriscore . ".png") }}"> + @endif
    -
    - @if ($product->promotions->count()) +
    + {{-- @if ($product->promotions->count()) @fmt_currency($product->priceTtc) - @endif - @fmt_currency($product->discountedPriceTtc) @fmt_sellunit($product->sell_unit) + @endif --}} +

    + @if ($product->weight_variable) Environ* @endif + @fmt_currency($product->discountedPriceTtc) + /{{ $product->sell_unit }} +

    @can('addToCart', $product) @endcan
    @if ($product->weight_variable) -

    *Prix variable en fonction du poids

    +

    *Produit vendu au kilo : @fmt_currency($product->priceKgTtc)/kg

    @endif
    @@ -164,5 +170,5 @@ --}}
    -
    + @endsection diff --git a/resources/views/front/sable/ranges.blade.php b/resources/views/front/sable/ranges.blade.php index 388fbc88..0f98bc8a 100644 --- a/resources/views/front/sable/ranges.blade.php +++ b/resources/views/front/sable/ranges.blade.php @@ -6,16 +6,19 @@ @section('breadcrumb', request()->route()->getName()) @section('content') -
    +
    @php $dataComponent = [ 'hasPromotion' => request()->promotion ? true : false, 'ranges' => $ranges, 'brands' => \App\Enums\ProductBrand::toArray(), 'tags' => $tags, - 'products' => \App\Http\Resources\ProductResource::collection($products) + 'products' => \App\Http\Resources\ProductResource::collection($products), + 'productsResults' => $products->perPage(), + 'search' => $sessionFilter->search ?? '', + 'filters' => $sessionFilter, ]; @endphp -
    + @endsection diff --git a/resources/views/front/sable/sales/confirm.blade.php b/resources/views/front/sable/sales/confirm.blade.php index d66ad772..ac6b3b1f 100644 --- a/resources/views/front/sable/sales/confirm.blade.php +++ b/resources/views/front/sable/sales/confirm.blade.php @@ -3,11 +3,10 @@ @section('title', __('Validation de commande')) @section('description', 'Validation de votre commande.') -@section('breadcrumb', request()->route()->getName()) +@section('breadcrumb', 'no') @section('content')
    -
    @include('partials.tunnel-stepper')
    @@ -39,7 +38,6 @@

    {{ $magasin->name }}

    {{ $magasin->address }}

    {{ $magasin->postcode }} {{ $magasin->city }}

    - diff --git a/resources/views/front/sable/sales/pick-slot.blade.php b/resources/views/front/sable/sales/pick-slot.blade.php index 78084b58..310c98d2 100644 --- a/resources/views/front/sable/sales/pick-slot.blade.php +++ b/resources/views/front/sable/sales/pick-slot.blade.php @@ -7,7 +7,6 @@ @section('content')
    -
    @include('partials.tunnel-stepper') @@ -32,7 +31,7 @@
    - +
    diff --git a/resources/views/front/sable/sales/recap.blade.php b/resources/views/front/sable/sales/recap.blade.php index ea36fa2a..4834dd81 100644 --- a/resources/views/front/sable/sales/recap.blade.php +++ b/resources/views/front/sable/sales/recap.blade.php @@ -3,9 +3,10 @@ @section('title', __('Recapitulatif de commande')) @section('description', 'Recapitulatif de votre commande.') +@section('breadcrumb', request()->route()->getName()) + @section('content')
    -
    @include('partials.tunnel-stepper')
    @@ -14,8 +15,9 @@ - + + @@ -28,35 +30,36 @@

    bientôt disponible

    - - @if (isset($cartItem->model->picture)) - {{ $cartItem->name }} - @else - {{ $cartItem->name }} - @endif - + @if (isset($cartItem->model->picture)) + {{ $cartItem->name }} + @else + {{ $cartItem->name }} + @endif
    -
    -
    - -
    - {{ $cartItem->name }} -
    -
    -

    {!! $cartItem->model->description !!}

    -
    +
    + + + + @if($cartItem->model->description)
    {!! $cartItem->model->description !!}
    @endif +

    *Produit vendu au kilo : @fmt_currency($cartItem->model->priceKgTtc)/kg

    -
    - @if ($cartItem->model->promotions->count()) +
    + {{-- @if ($cartItem->model->promotions->count()) @fmt_currency($cartItem->model->priceTtc) - @endif - @fmt_currency($cartItem->model->discountedPriceTtc) + @endif --}} + + {{ sprintf('%s €', number_format($cartItem->model->discountedPriceTtc * $cartItem->qty, 2, ',', ' ')) }} +
    - + {{--
    + +
    --}}
    @@ -64,10 +67,19 @@
    - - - + + + @endforeach diff --git a/resources/views/front/sable/sass/fo/base/_common.scss b/resources/views/front/sable/sass/fo/base/_common.scss index ce3cf5ac..2327e29d 100644 --- a/resources/views/front/sable/sass/fo/base/_common.scss +++ b/resources/views/front/sable/sass/fo/base/_common.scss @@ -43,11 +43,24 @@ img { } } - &-text p { - margin: 0; - text-overflow: ellipsis; + &-text { + height: calc(1em * 1.5 * 2); overflow: hidden; - white-space: nowrap; + text-overflow: ellipsis; + + p { + display: block; + display: -webkit-box; + max-width: 250px; + height: calc(1em * 1.5 * 2); + margin: 0; + font-size: 1em; + line-height: 1.5; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; + } } &-activate { @@ -135,7 +148,8 @@ img { .auth { &-login { form { - width: 25rem; + width: 100%; + max-width: 25rem; .form-control { width: 20rem; diff --git a/resources/views/front/sable/sass/fo/base/_fonts.scss b/resources/views/front/sable/sass/fo/base/_fonts.scss index 3c940802..f170b399 100644 --- a/resources/views/front/sable/sass/fo/base/_fonts.scss +++ b/resources/views/front/sable/sass/fo/base/_fonts.scss @@ -1,61 +1,61 @@ @font-face { font-family: "Barlow_Extra_Bold"; - src: url("../fonts/barlow/Barlow-ExtraBold.ttf") format("truetype"); - font-weight: normal; font-style: normal; + font-weight: normal; + src: url("../fonts/barlow/Barlow-ExtraBold.ttf") format("truetype"); } @font-face { font-family: "Barlow_Regular"; - src: url("../fonts/barlow/Barlow-Regular.ttf") format("truetype"); - font-weight: normal; font-style: normal; + font-weight: normal; + src: url("../fonts/barlow/Barlow-Regular.ttf") format("truetype"); } @font-face { font-family: "Barlow_Bold"; + font-style: normal; + font-weight: normal; src: url("../fonts/barlow/Barlow-Bold.woff2") format("ttf"), url("../fonts/barlow/Barlow-Bold.woff") format("woff"), url("../fonts/barlow/Barlow-Bold.ttf") format("ttf"), url("../fonts/barlow/Barlow-Bold.svg") format("svg"), url("../fonts/barlow/Barlow-Bold.eot") format("eot"); - font-weight: normal; - font-style: normal; } @font-face { font-family: "Barlow_Condensed_Medium"; + font-style: normal; + font-weight: normal; src: url("../fonts/barlow/BarlowCondensed-Medium.woff2") format("ttf"), url("../fonts/barlow/BarlowCondensed-Medium.woff") format("woff"), url("../fonts/barlow/BarlowCondensed-Medium.ttf") format("ttf"), url("../fonts/barlow/BarlowCondensed-Medium.svg") format("svg"), url("../fonts/barlow/BarlowCondensed-Medium.eot") format("eot"); - font-weight: normal; - font-style: normal; } @font-face { font-family: "Barlow_Condensed_Semi_Bold"; + font-style: normal; + font-weight: normal; src: url("../fonts/barlow/BarlowCondensed-SemiBold.woff2") format("ttf"), url("../fonts/barlow/BarlowCondensed-SemiBold.woff") format("woff"), url("../fonts/barlow/BarlowCondensed-SemiBold.ttf") format("ttf"), url("../fonts/barlow/BarlowCondensed-SemiBold.svg") format("svg"), url("../fonts/barlow/BarlowCondensed-SemiBold.eot") format("eot"); - font-weight: normal; - font-style: normal; } @font-face { font-family: "Barlow_Medium"; + font-style: normal; + font-weight: normal; src: url("../fonts/barlow/Barlow-Medium.woff2") format("ttf"), url("../fonts/barlow/Barlow-Medium.woff") format("woff"), url("../fonts/barlow/Barlow-Medium.ttf") format("ttf"), url("../fonts/barlow/Barlow-Medium.svg") format("svg"), url("../fonts/barlow/Barlow-Medium.eot") format("eot"); - font-weight: normal; - font-style: normal; } diff --git a/resources/views/front/sable/sass/fo/base/_utils.scss b/resources/views/front/sable/sass/fo/base/_utils.scss index b0f8d46d..df4d87db 100644 --- a/resources/views/front/sable/sass/fo/base/_utils.scss +++ b/resources/views/front/sable/sass/fo/base/_utils.scss @@ -79,6 +79,10 @@ @include btn($white, none, $orange); } +.btn-more-products svg { + height: 2rem; +} + .btn-section { margin-top: 1rem; @include btn($dark, 1px solid $dark, transparent); @@ -127,10 +131,6 @@ fill: $dark; } -.w-fit { - width: fit-content; -} - .shadow { box-shadow: $shadow !important; } diff --git a/resources/views/front/sable/sass/fo/pages/_command.scss b/resources/views/front/sable/sass/fo/pages/_command.scss index 6f7ae656..58266b5d 100644 --- a/resources/views/front/sable/sass/fo/pages/_command.scss +++ b/resources/views/front/sable/sass/fo/pages/_command.scss @@ -20,6 +20,12 @@ } } + .timeslot-container .card-text { + height: initial; + overflow: initial; + text-overflow: initial; + } + .table { border-collapse: separate; border-spacing: 0 0.5rem; @@ -127,7 +133,7 @@ background-color: transparent; td.text-center { - width: 20%; + width: 15%; } .card:hover .filtre { @@ -147,7 +153,7 @@ } } } - + .recap-actions { bottom: auto; } @@ -190,4 +196,4 @@ // XXXXXXX XXXXXXXXXXXXXX XXXXXXXLLLLLLLLLLLLLLLLLLLLLLLL @include media-breakpoint-up(xxl) { //1400px // -} \ No newline at end of file +} diff --git a/resources/views/front/sable/sass/fo/pages/_home.scss b/resources/views/front/sable/sass/fo/pages/_home.scss index e7f1110d..3b2f445c 100644 --- a/resources/views/front/sable/sass/fo/pages/_home.scss +++ b/resources/views/front/sable/sass/fo/pages/_home.scss @@ -36,6 +36,10 @@ overflow: visible; } + &-slide { + height: 30rem !important; + } + &-button-next { right: 0; } @@ -63,11 +67,6 @@ } #services { - #demarche { - .card-body p { - font-size: .8em; - } - } #avantages { .card { .card-img-top { @@ -137,36 +136,6 @@ scroll-margin-top: 5rem; } - #promotions { - .swiper { - &-container { - max-width: 100%; - } - - &-button { - &-next, &-prev { - width: 2rem; - height: 2rem; - background-color: $orange; - - &::after { - color: $white; - font-size: 1em; - } - } - - &-disabled { - border: 1px solid $grey; - background-color: transparent; - - &::after { - color: $grey !important; - } - } - } - } - } - #rayons { .row-cols-2 .row { &:hover { @@ -215,7 +184,41 @@ // L::::::::::::::::::::::L GGG::::::GGG:::G // LLLLLLLLLLLLLLLLLLLLLLLL GGGGGG GGGG @include media-breakpoint-up(lg) { //992px - // + #promotions { + .swiper { + &-container { + max-width: 100%; + } + + &-slide { + .row { + max-width: 20rem !important; + } + } + + &-button { + &-next, &-prev { + width: 2rem; + height: 2rem; + background-color: $orange; + + &::after { + color: $white; + font-size: 1em; + } + } + + &-disabled { + border: 1px solid $grey; + background-color: transparent; + + &::after { + color: $grey !important; + } + } + } + } + } } // XXXXXXX XXXXXXXLLLLLLLLLLL // X:::::X X:::::XL:::::::::L diff --git a/resources/views/front/sable/sass/fo/pages/_ranges.scss b/resources/views/front/sable/sass/fo/pages/_ranges.scss index dd62191a..56a10495 100644 --- a/resources/views/front/sable/sass/fo/pages/_ranges.scss +++ b/resources/views/front/sable/sass/fo/pages/_ranges.scss @@ -27,7 +27,7 @@ font-size: 2em; } - button .svg { + button svg { transform: rotate(-90deg); } @@ -148,11 +148,11 @@ } button { - &[aria-expanded=true] .svg { + &[aria-expanded=true] svg { transform: rotate(180deg); } - .svg { + svg { transform: rotate(0deg); } } @@ -167,6 +167,16 @@ } } } + + .products { + .card-body { + min-height: auto; + } + + .placeholder { + height: 20rem; + } + } } // XXXXXXX XXXXXXXLLLLLLLLLLL // X:::::X X:::::XL:::::::::L diff --git a/resources/views/front/sable/sass/fo/partials/_navbar.scss b/resources/views/front/sable/sass/fo/partials/_navbar.scss index 29631445..0b02b7b8 100644 --- a/resources/views/front/sable/sass/fo/partials/_navbar.scss +++ b/resources/views/front/sable/sass/fo/partials/_navbar.scss @@ -13,6 +13,14 @@ background-position: center; } + &-basket-item { + color: $dark; + background-color: $white; + width: 1.5rem; + height: 1.5rem; + margin: -.5rem -1rem; + } + &-basket-icon { background-image: url("../img/icons/icon_cart_white.png"); } @@ -145,10 +153,8 @@ .btn { &-basket-item { + color: $white; background-color: $dark; - width: 1.5rem; - height: 1.5rem; - margin: -.5rem -1rem; } &-basket-icon { diff --git a/resources/views/front/sable/sass/utilities/_bs-variables.scss b/resources/views/front/sable/sass/utilities/_bs-variables.scss index 8f446d30..a9f16b0a 100644 --- a/resources/views/front/sable/sass/utilities/_bs-variables.scss +++ b/resources/views/front/sable/sass/utilities/_bs-variables.scss @@ -4,6 +4,14 @@ $spacers-override: ( ); $spacers: map-merge($spacers-override, $spacers); + +$h7-font-size: $font-size-base * 0.85; +$font-sizes-override: ( + 7: $h7-font-size +); +$font-sizes: map-merge($font-sizes-override, $font-sizes); + + // RESPONSIVE VARIABLES FOR BOOTSTRAP /** * FORMAT : 'class name' ('attribute(s) added') (key:values, key:values...), @@ -11,10 +19,10 @@ $spacers: map-merge($spacers-override, $spacers); * RESULT : .w-sm-25 { width: 25%; } | .w-md-100 { width: 100%; } etc... */ $targets: ( - 'w' ('width') (0:0%, 25:25%, 50:50%, 75:75%, 100:100%, auto:auto, fit:fit-content), + 'w' ('width') (0:0%, 8:8rem, 25:25%, 50:50%, 75:75%, 100:100%, auto:auto, fit:fit-content), 'h' ('height') (0:0%, 25:25%, 50:50%, 75:75%, 100:100%, auto:auto, fit:fit-content), 'opacity' ('opacity') (0:0, 25:0.25, 50:0.50, 75:0.75, 100:1), 'position' ('position') (relative:relative, absolute:absolute, fixed:fixed, sticky:sticky), 'text' ('text') (center:center, start:left, end:right), 'd' ('display') (block:block, flex:flex, table-header-group:table-header-group, table-cell:table-cell, none:none) -); \ No newline at end of file +); diff --git a/resources/views/front/sable/terms.blade.php b/resources/views/front/sable/terms.blade.php index b9877f88..5d14cd62 100644 --- a/resources/views/front/sable/terms.blade.php +++ b/resources/views/front/sable/terms.blade.php @@ -6,10 +6,10 @@ @section('breadcrumb', 'no') @section('content') -
    +
    + @endsection diff --git a/resources/views/front/sable/theme.config.php b/resources/views/front/sable/theme.config.php index ce05d4a1..493ac0f7 100644 --- a/resources/views/front/sable/theme.config.php +++ b/resources/views/front/sable/theme.config.php @@ -2,7 +2,7 @@ return [ 'theme_name' => 'sable', - 'site_name' => 'Boutique Sablé', + 'site_name' => 'La Boutique de Cocotte', 'company' => 'LDC', 'analytics' => '', 'product_image_maxwidth' => '500', diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php index a32864fe..ea5a9bb7 100644 --- a/routes/breadcrumbs.php +++ b/routes/breadcrumbs.php @@ -67,7 +67,7 @@ Breadcrumbs::for('auth.change-password', function ($trail) { // Tunnel commande. Breadcrumbs::for('tunnel', function ($trail) { $trail->parent('home'); - $trail->push(__('Commande'), null); + $trail->push(__('Panier'), null); }); Breadcrumbs::for('sales.recap', function ($trail) { $trail->parent('tunnel'); @@ -75,7 +75,7 @@ Breadcrumbs::for('sales.recap', function ($trail) { }); Breadcrumbs::for('sales.pick-slot', function ($trail, $reference) { $trail->parent('tunnel'); - $trail->push(__('Retrait'), route('sales.pick-slot', ['reference' => $reference])); + $trail->push(__('Réservation'), route('sales.pick-slot', ['reference' => $reference])); }); Breadcrumbs::for('sales.confirm', function ($trail, $reference) { $trail->parent('tunnel'); @@ -95,10 +95,6 @@ Breadcrumbs::for('product', function ($trail, $product) { $trail->parent('products'); $trail->push($product->name, route('product', ['productSlug' => $product->slug])); }); -Breadcrumbs::for('products.tagfilter', function ($trail, $tag) { - $trail->parent('products'); - $trail->push($tag->label, route('products.tagfilter', ['tagSlug', $tag->slug])); -}); Breadcrumbs::for('search', function ($trail) { $trail->parent('products'); $trail->push(__('Recherche'), route('search')); @@ -107,13 +103,13 @@ Breadcrumbs::for('search', function ($trail) { // Account management. Breadcrumbs::for('account.dashboard', function ($trail) { $trail->parent('home'); - $trail->push(__('Mon Compte'), route('account.dashboard')); + $trail->push(__('Mon compte'), route('account.dashboard')); }); Breadcrumbs::for('account.my-orders', function ($trail) { $trail->parent('account.dashboard'); - $trail->push(__('Mes Commandes'), route('account.my-orders')); + $trail->push(__('Mes commandes'), route('account.my-orders')); }); Breadcrumbs::for('account.order-detail', function ($trail, $reference) { $trail->parent('account.my-orders'); - $trail->push(__('Détail Commandes'), route('account.order-detail', ['reference', $reference])); + $trail->push(__('Détails d\'une commande'), route('account.order-detail', ['reference', $reference])); }); diff --git a/routes/web-fo.php b/routes/web-fo.php index 8a42850c..1309f75d 100644 --- a/routes/web-fo.php +++ b/routes/web-fo.php @@ -94,17 +94,16 @@ Route::get('/gamme-de-produits/{rangeSlug}', [ProductsController::class, 'range' ->middleware('redirect-slugs'); // Products display. -Route::get('/produits', [ProductsController::class, 'allProducts'])->name('products'); +Route::get('/produits', [ProductsController::class, 'allProductsFiltered'])->name('products'); +Route::get('/recherche', [ProductsController::class, 'allProductsFiltered'])->name('search'); + // Products filter ajax. Route::get('/produits/filter', [ProductsController::class, 'allProductsFiltered'])->name('products.filters'); -// Products tag filter. -Route::get('/produits/{tagSlug}', [ProductsController::class, 'tagFiltered'])->name('products.tagfilter'); + // Product. Route::get('/produit/{productSlug}', [ProductsController::class, 'product'])->name('product') ->middleware('redirect-slugs'); -Route::get('/recherche', [ProductsController::class, 'allProducts'])->name('search'); - // Route ajax pour Single Optin. Route::post('/optin', [HomeController::class, 'addOptIn'])->name('add-single-optin');
    QuantitéPrix au KG TTC Prix TTC Sous-total TTC
    {{ $cartItem->qty }}@fmt_currency($cartItem->model->discountedPriceTtc){{ sprintf('%s €', number_format($cartItem->model->discountedPriceTtc * $cartItem->qty, 2, ',', ' ')) }} - + + @if ($cartItem->model->weight_variable) @fmt_currency($cartItem->model->priceKgTtc) @endif + + @if ($cartItem->model->weight_variable) Environ* @endif + @fmt_currency($cartItem->model->discountedPriceTtc) + + @if ($cartItem->model->weight_variable) Environ* @endif + {{ sprintf('%s €', number_format($cartItem->model->discountedPriceTtc * $cartItem->qty, 2, ',', ' ')) }} + +