diff --git a/app/Policies/ProductPolicy.php b/app/Policies/ProductPolicy.php index 91e5f35c..2e39ef64 100644 --- a/app/Policies/ProductPolicy.php +++ b/app/Policies/ProductPolicy.php @@ -3,7 +3,6 @@ namespace App\Policies; use App\Models\Product; -use App\Models\User; use Illuminate\Auth\Access\HandlesAuthorization; use Illuminate\Auth\Access\Response; use Illuminate\Support\Carbon; @@ -19,7 +18,7 @@ class ProductPolicy * @return \Illuminate\Auth\Access\Response * @phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed */ - public function addtocart(?User $user, Product $product) + public function addtocart($user, Product $product) { // phpcs:enable $now = Carbon::now(); diff --git a/resources/views/front/sable/js/app.js b/resources/views/front/sable/js/app.js index 2132e3a8..4199b8c0 100644 --- a/resources/views/front/sable/js/app.js +++ b/resources/views/front/sable/js/app.js @@ -58,6 +58,7 @@ Vue.component( "basket-buttons", require("./components/BasketButtons.vue").default ); +Vue.component("basket-recap", require("./components/BasketRecap.vue").default); const store = new Vuex.Store({ state: { diff --git a/resources/views/front/sable/js/components/BasketRecap.vue b/resources/views/front/sable/js/components/BasketRecap.vue new file mode 100644 index 00000000..f6c39f56 --- /dev/null +++ b/resources/views/front/sable/js/components/BasketRecap.vue @@ -0,0 +1,230 @@ + + + diff --git a/resources/views/front/sable/partials/tunnel-stepper.blade.php b/resources/views/front/sable/partials/tunnel-stepper.blade.php index 481d68a6..640440f8 100644 --- a/resources/views/front/sable/partials/tunnel-stepper.blade.php +++ b/resources/views/front/sable/partials/tunnel-stepper.blade.php @@ -1,24 +1,21 @@
-
- ⟵ -
-
1 ? "step-done" : "") }}"> +
1 ? "step-done" : "") }}">
1- -

Récapitulatif

+

Récapitulatif

-
2 ? "step-done" : "") }}"> +
2 ? "step-done" : "") }}">
2- -

Réservation

+

Réservation

-
3 ? "step-done" : "") }}"> +
3 ? "step-done" : "") }}">
3- -

Confirmation

+

Confirmation

{{ $activestep }}/3 diff --git a/resources/views/front/sable/sales/recap.blade.php b/resources/views/front/sable/sales/recap.blade.php index 69a84444..496e484f 100644 --- a/resources/views/front/sable/sales/recap.blade.php +++ b/resources/views/front/sable/sales/recap.blade.php @@ -15,107 +15,11 @@ @endif @include('partials.tunnel-stepper')
-

Récapitulatif de votre panier

-
- - - - - - - - - - - - @foreach ($cart as $cartItem) - - - - - - - - - - - @endforeach - -
QuantitéPrix au KG TTCPrix TTCSous-total TTC
-
-
-

bientôt disponible

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

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

- @else -

Prix au kilo : @fmt_currency($cartItem->model->priceKgTtc)/kg

- @endif - -
-
- {{-- @if ($cartItem->model->promotions->count()) - @fmt_currency($cartItem->model->priceTtc) - @endif --}} - - {{ sprintf('%s €', number_format($cartItem->model->discountedPriceTtc * $cartItem->qty, 2, ',', ' ')) }} - -
- {{--
- -
--}} -
-
-
-
-
{{ $cartItem->qty }} - @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, ',', ' ')) }} - - -
- - - - - - - -
Total estimé TTC{{ sprintf('%s €', number_format($cartInfos['totalTTC'], 2, ',', ' ')) }}
-
-
- ⟵ Continuer mes achats - @if (count($cart) > 0) -
- @csrf - -
- @else -
Votre commande est vide.
- Terminer une commande en attente ? - @endif -
+

+ Récapitulatif de votre panier +

+
diff --git a/resources/views/front/sable/sass/fo/pages/_command.scss b/resources/views/front/sable/sass/fo/pages/_command.scss index 58266b5d..080894b0 100644 --- a/resources/views/front/sable/sass/fo/pages/_command.scss +++ b/resources/views/front/sable/sass/fo/pages/_command.scss @@ -3,7 +3,7 @@ background-color: $medium-grey; z-index: 1; - .col-8:not(.active) { + .col-10:not(.active) { display: none; } @@ -34,6 +34,8 @@ font-size: 1.5em; font-family: 'Barlow_Extra_Bold'; background-color: $white; + position: sticky; + top: 8rem; } .btn-cross { @@ -47,45 +49,6 @@ z-index: $zindex-fixed; } } - -// SSSSSSSSSSSSSSS MMMMMMMM MMMMMMMM -// SS:::::::::::::::SM:::::::M M:::::::M -// S:::::SSSSSS::::::SM::::::::M M::::::::M -// S:::::S SSSSSSSM:::::::::M M:::::::::M -// S:::::S M::::::::::M M::::::::::M -// S:::::S M:::::::::::M M:::::::::::M -// S::::SSSS M:::::::M::::M M::::M:::::::M -// SS::::::SSSSS M::::::M M::::M M::::M M::::::M -// SSS::::::::SS M::::::M M::::M::::M M::::::M -// SSSSSS::::S M::::::M M:::::::M M::::::M -// S:::::SM::::::M M:::::M M::::::M -// S:::::SM::::::M MMMMM M::::::M -// SSSSSSS S:::::SM::::::M M::::::M -// S::::::SSSSSS:::::SM::::::M M::::::M -// S:::::::::::::::SS M::::::M M::::::M -// SSSSSSSSSSSSSSS MMMMMMMM MMMMMMMM -@include media-breakpoint-up(sm) { //576px - // -} -// MMMMMMMM MMMMMMMMDDDDDDDDDDDDD -// M:::::::M M:::::::MD::::::::::::DDD -// M::::::::M M::::::::MD:::::::::::::::DD -// M:::::::::M M:::::::::MDDD:::::DDDDD:::::D -// M::::::::::M M::::::::::M D:::::D D:::::D -// M:::::::::::M M:::::::::::M D:::::D D:::::D -// M:::::::M::::M M::::M:::::::M D:::::D D:::::D -// M::::::M M::::M M::::M M::::::M D:::::D D:::::D -// M::::::M M::::M::::M M::::::M D:::::D D:::::D -// M::::::M M:::::::M M::::::M D:::::D D:::::D -// M::::::M M:::::M M::::::M D:::::D D:::::D -// M::::::M MMMMM M::::::M D:::::D D:::::D -// M::::::M M::::::MDDD:::::DDDDD:::::D -// M::::::M M::::::MD:::::::::::::::DD -// M::::::M M::::::MD::::::::::::DDD -// MMMMMMMM MMMMMMMMDDDDDDDDDDDDD -@include media-breakpoint-up(md) { //768px - // -} // LLLLLLLLLLL GGGGGGGGGGGGG // L:::::::::L GGG::::::::::::G // L:::::::::L GG:::::::::::::::G @@ -107,7 +70,7 @@ .order { background-color: transparent; - .col-8:not(.active) { + .col-10:not(.active) { display: block; } @@ -148,6 +111,7 @@ &-total { font-size: 1em; + position: initial; td:not(.font-Barlow-extra-bold) { font-family: 'Barlow_Regular'; } @@ -159,41 +123,3 @@ } } } -// XXXXXXX XXXXXXXLLLLLLLLLLL -// X:::::X X:::::XL:::::::::L -// X:::::X X:::::XL:::::::::L -// X::::::X X::::::XLL:::::::LL -// XXX:::::X X:::::XXX L:::::L -// X:::::X X:::::X L:::::L -// X:::::X:::::X L:::::L -// X:::::::::X L:::::L -// X:::::::::X L:::::L -// X:::::X:::::X L:::::L -// X:::::X X:::::X L:::::L -// XXX:::::X X:::::XXX L:::::L LLLLLL -// X::::::X X::::::XLL:::::::LLLLLLLLL:::::L -// X:::::X X:::::XL::::::::::::::::::::::L -// X:::::X X:::::XL::::::::::::::::::::::L -// XXXXXXX XXXXXXXLLLLLLLLLLLLLLLLLLLLLLLL -@include media-breakpoint-up(xl) { //1200px - // -} -// XXXXXXX XXXXXXXXXXXXXX XXXXXXXLLLLLLLLLLL -// X:::::X X:::::XX:::::X X:::::XL:::::::::L -// X:::::X X:::::XX:::::X X:::::XL:::::::::L -// X::::::X X::::::XX::::::X X::::::XLL:::::::LL -// XXX:::::X X:::::XXXXXX:::::X X:::::XXX L:::::L -// X:::::X X:::::X X:::::X X:::::X L:::::L -// X:::::X:::::X X:::::X:::::X L:::::L -// X:::::::::X X:::::::::X L:::::L -// X:::::::::X X:::::::::X L:::::L -// X:::::X:::::X X:::::X:::::X L:::::L -// X:::::X X:::::X X:::::X X:::::X L:::::L -// XXX:::::X X:::::XXXXXX:::::X X:::::XXX L:::::L LLLLLL -// X::::::X X::::::XX::::::X X::::::XLL:::::::LLLLLLLLL:::::L -// X:::::X X:::::XX:::::X X:::::XL::::::::::::::::::::::L -// X:::::X X:::::XX:::::X X:::::XL::::::::::::::::::::::L -// XXXXXXX XXXXXXXXXXXXXX XXXXXXXLLLLLLLLLLLLLLLLLLLLLLLL -@include media-breakpoint-up(xxl) { //1400px - // -}