diff --git a/app/Http/Controllers/Admin/Shop/HomepageController.php b/app/Http/Controllers/Admin/Shop/HomepageController.php index a6eadef7..3de980a6 100644 --- a/app/Http/Controllers/Admin/Shop/HomepageController.php +++ b/app/Http/Controllers/Admin/Shop/HomepageController.php @@ -11,8 +11,7 @@ class HomepageController extends Controller { public function index(HomepagesDataTable $dataTable) { - $data = []; - return $dataTable->render('Admin.Shop.Homepages.list', $data); + return $dataTable->render('Admin.Shop.Homepages.list', $data ?? []); } public function create() @@ -33,7 +32,7 @@ class HomepageController extends Controller public function edit($id) { - $data['homepage'] = Homepages::edit($id); + $data['homepage'] = Homepages::get($id); return view('Admin.Shop.Homepages.edit', $data); } diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 77b23d0e..a0a2a8a3 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -7,15 +7,7 @@ use Illuminate\Foundation\Bus\DispatchesJobs; use Illuminate\Foundation\Validation\ValidatesRequests; use Illuminate\Routing\Controller as BaseController; -use App\Repositories\Shop\Categories; - class Controller extends BaseController { use AuthorizesRequests, DispatchesJobs, ValidatesRequests; - - public static function init() - { - $data['categories'] = Categories::getTreeVisibles(); - return $data; - } } diff --git a/app/Http/Controllers/Shop/ArticleController.php b/app/Http/Controllers/Shop/ArticleController.php index b7ee3e8b..61a34d27 100644 --- a/app/Http/Controllers/Shop/ArticleController.php +++ b/app/Http/Controllers/Shop/ArticleController.php @@ -12,7 +12,6 @@ class ArticleController extends Controller public function show($id) { - $data = self::init(); $data['article'] = Articles::getArticleToSell($id); return view('Shop.Articles.show', $data); } diff --git a/app/Http/Controllers/Shop/Auth/RegisterController.php b/app/Http/Controllers/Shop/Auth/RegisterController.php index d52c2d54..7a40a159 100644 --- a/app/Http/Controllers/Shop/Auth/RegisterController.php +++ b/app/Http/Controllers/Shop/Auth/RegisterController.php @@ -46,7 +46,6 @@ class RegisterController extends Controller public function showRegistrationForm() { - $data = self::init(); return view('Shop.auth.register', $data ?? []); } @@ -81,7 +80,6 @@ class RegisterController extends Controller public function emailSendVerification(Request $request) { $request->user()->sendEmailVerificationNotification(); - return back()->with('message', 'Verification link sent!'); } } diff --git a/app/Http/Controllers/Shop/BasketController.php b/app/Http/Controllers/Shop/BasketController.php index 214f6caa..93d85a67 100644 --- a/app/Http/Controllers/Shop/BasketController.php +++ b/app/Http/Controllers/Shop/BasketController.php @@ -8,7 +8,7 @@ use App\Http\Controllers\Controller; use App\Repositories\Core\User\ShopCart; use App\Repositories\Shop\Offers; use App\Repositories\Shop\Orders; - +use App\Repositories\Users; class BasketController extends Controller { @@ -37,10 +37,7 @@ class BasketController extends Controller public function basket() { - $data = self::init(); $data['basket'] = Offers::getBasket(); - // dump($data['basket']); - // exit; return view('Shop.Baskets.basket', $data); } diff --git a/app/Http/Controllers/Shop/CategoryController.php b/app/Http/Controllers/Shop/CategoryController.php index 1430d6fd..8da7347c 100644 --- a/app/Http/Controllers/Shop/CategoryController.php +++ b/app/Http/Controllers/Shop/CategoryController.php @@ -7,8 +7,6 @@ use App\Http\Controllers\Controller; use App\Repositories\Shop\Articles; use App\Repositories\Shop\Categories; -use App\Repositories\Shop\Offers; -use App\Repositories\Shop\Tags; use App\Repositories\Shop\TagGroups; use App\Datatables\Shop\CategoriesDataTable; @@ -22,23 +20,19 @@ class CategoryController extends Controller public function show(Request $request, $category_id) { - $data = self::init(); - $data['category'] = Categories::getFull($category_id); - $data['breadcrumb'] = Categories::getAncestorsByCategory($category_id); - $data['display_by_rows'] = $request->input('display_by_rows') ?? false; - $data['product_type'] = $request->input('product_type') ?? 'botanic'; - $data['tags_selected'] = $request->input('tags') ?? []; - - $data['articles'] = Articles::getArticlesToSell([ - 'category_id' => $category_id, - 'tags' => $data['tags_selected'], - 'product_type' => $data['product_type'], - ]); - // dump($data['articles']); - // exit; - $data['tags'] = TagGroups::getWithTagsAndCountOffers($category_id); - // dump($data['tags']); - // exit; + $data = [ + 'category' => Categories::getFull($category_id), + 'breadcrumb' => Categories::getAncestorsByCategory($category_id), + 'display_by_rows' => $request->input('display_by_rows') ?? false, + 'product_type' => $request->input('product_type') ?? 'botanic', + 'tags_selected' => $request->input('tags') ?? [], + 'articles' => Articles::getArticlesToSell([ + 'category_id' => $category_id, + 'tags' => $request->input('tags') ?? [], + 'product_type' => $request->input('product_type') ?? 'botanic', + ]), + 'tags' => TagGroups::getWithTagsAndCountOffers($category_id), + ]; return view('Shop.Shelves.shelve', $data); } diff --git a/app/Http/Controllers/Shop/Controller.php b/app/Http/Controllers/Shop/Controller.php index 65c8466f..b55e7501 100644 --- a/app/Http/Controllers/Shop/Controller.php +++ b/app/Http/Controllers/Shop/Controller.php @@ -6,8 +6,4 @@ use App\Http\Controllers\Controller as ParentController; class Controller extends ParentController { - public function __construct() - { - // $this->middleware('auth:guest'); - } } diff --git a/app/Http/Controllers/Shop/HomeController.php b/app/Http/Controllers/Shop/HomeController.php index 16c5d44b..9904d240 100644 --- a/app/Http/Controllers/Shop/HomeController.php +++ b/app/Http/Controllers/Shop/HomeController.php @@ -13,15 +13,13 @@ class HomeController extends Controller { public function index(Request $request) { - $input = $request->input(); - $data = self::init(); - $data['display_by_rows'] = $input['by_rows'] ?? false; - $data['shelves'] = Articles::getArticlesByHomepage(); - $data['text'] = Homepages::getHomepage(); - // dump($data['shelves']); - // exit; - $data['tags'] = TagGroups::getWithTagsAndCountOffers(); - $data['no_filter'] = true; + $data = [ + 'display_by_rows' => $request->input('by_rows') ?? false, + 'shelves' => Articles::getArticlesByHomepage(), + 'text' => Homepages::getHomepage(), + 'tags' => TagGroups::getWithTagsAndCountOffers(), + 'no_filter' => true, + ]; return view('Shop.home', $data); } } diff --git a/app/Http/Controllers/Shop/OrderController.php b/app/Http/Controllers/Shop/OrderController.php index acc72888..8f4fea90 100644 --- a/app/Http/Controllers/Shop/OrderController.php +++ b/app/Http/Controllers/Shop/OrderController.php @@ -5,83 +5,17 @@ namespace App\Http\Controllers\Shop; use Illuminate\Http\Request; use App\Http\Controllers\Controller; +use App\Repositories\Core\User\ShopCart; use App\Repositories\Shop\Orders; +use App\Repositories\Shop\Offers; +use App\Repositories\Shop\SaleChannels; class OrderController extends Controller { - /** - * Display a listing of the resource. - * - * @return \Illuminate\Http\Response - */ - public function index() + public function order() { - // - } - - /** - * Show the form for creating a new resource. - * - * @return \Illuminate\Http\Response - */ - public function create() - { - // - } - - /** - * Store a newly created resource in storage. - * - * @param \Illuminate\Http\Request $request - * @return \Illuminate\Http\Response - */ - public function store(Request $request) - { - // - } - - /** - * Display the specified resource. - * - * @param \App\Order $order - * @return \Illuminate\Http\Response - */ - public function show(Order $order) - { - // - } - - /** - * Show the form for editing the specified resource. - * - * @param \App\Order $order - * @return \Illuminate\Http\Response - */ - public function edit(Order $order) - { - // - } - - /** - * Update the specified resource in storage. - * - * @param \Illuminate\Http\Request $request - * @param \App\Order $order - * @return \Illuminate\Http\Response - */ - public function update(Request $request, Order $order) - { - // - } - - /** - * Remove the specified resource from storage. - * - * @param \App\Order $order - * @return \Illuminate\Http\Response - */ - public function destroy(Order $order) - { - // + $data['basket'] = ShopCart::getSummary(); + $data['sale_channel'] = SaleChannels::getDefault(); + return view('Shop.Orders.order', $data); } } diff --git a/app/Http/Controllers/Shop/SearchController.php b/app/Http/Controllers/Shop/SearchController.php index 5c67329f..e05a7375 100644 --- a/app/Http/Controllers/Shop/SearchController.php +++ b/app/Http/Controllers/Shop/SearchController.php @@ -11,11 +11,12 @@ class SearchController extends Controller { public function search(Request $request) { - $data = self::init(); - $data['articles'] = Searches::getResults($request->input()); - $data['articles_count'] = $data['articles'] ? count($data['articles']) : 0; - $data['search'] = $request->input(); - $data['product_type'] = $request->input('product_type'); + $data = [ + 'articles'] => Searches::getResults($request->input()), + 'articles_count' => $data['articles'] ? count($data['articles']) : 0, + 'search' = $request->input(), + 'product_type' => $request->input('product_type'), + ]; return view('Shop.Search.results', $data); } } diff --git a/app/Http/Requests/Shop/StoreOrderPost.php b/app/Http/Requests/Shop/StoreOrderPost.php new file mode 100644 index 00000000..9d1b6366 --- /dev/null +++ b/app/Http/Requests/Shop/StoreOrderPost.php @@ -0,0 +1,20 @@ + 'required', + ]; + } +} diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 9242dee7..d062be15 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -4,6 +4,9 @@ namespace App\Providers; use Illuminate\Support\ServiceProvider; use Illuminate\Support\Facades\Schema; +use Illuminate\Support\Facades\View; + +use App\View\Composers\Shop\LayoutComposer; class AppServiceProvider extends ServiceProvider { @@ -25,5 +28,6 @@ class AppServiceProvider extends ServiceProvider public function boot() { Schema::defaultStringLength(191); + View::composer('Shop.layout.layout', LayoutComposer::class); } } diff --git a/app/Repositories/Config.php b/app/Repositories/Config.php index e8bddbbf..21e36112 100644 --- a/app/Repositories/Config.php +++ b/app/Repositories/Config.php @@ -2,23 +2,19 @@ namespace App\Repositories; -use App\Repositories\Core\Auth\Users; +use App\Repositories\Users; +use App\Repositories\Shop\Categories; +use App\Repositories\Shop\Homepages; class Config { public static function init() { - $data['user'] = self::getUser(); - return ['init' => $data]; - } - - public static function getUser() - { - if (Users::getUser()) { - $data = Users::getInfo(); - } else { - $data = false; - } - return $data; + return [ + 'auth' => Users::getUser() ? Users::getInfo() : false, + 'categories' => Categories::getTreeVisibles(), + 'footer' => Homepages::getFooter(), + 'extra_footer' => Homepages::getExtraFooter(), + ]; } } diff --git a/app/Repositories/Core/Auth/Users.php b/app/Repositories/Core/Auth/Users.php index cf4d0741..b7112874 100644 --- a/app/Repositories/Core/Auth/Users.php +++ b/app/Repositories/Core/Auth/Users.php @@ -7,18 +7,14 @@ use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Str; -use Hyn\Tenancy\Database\Connection; use Laratrust\Traits\LaratrustUserTrait; +use LangleyFoxall\LaravelNISTPasswordRules\PasswordRules; use App\Models\Core\Auth\User; use App\Models\Core\Auth\RoleUser; -use App\Repositories\Clients; -use App\Repositories\Partners; use App\Repositories\Core\Upload; -use LangleyFoxall\LaravelNISTPasswordRules\PasswordRules; - class Users { use LaratrustUserTrait; @@ -38,44 +34,26 @@ class Users $data = $user->toArray(); $data['name'] = $user->name; $data['avatar'] = self::getAvatar($id); - // $data['last_login'] = $user->previousLoginAt(); - // $data['roles'] = self::getRoles(); - // $data['permissions'] = self::getPermissions(); $data['roles'] = $user->roles->pluck('id')->toArray(); $data['permissions'] = $user->allPermissions()->pluck('id')->toArray(); - $data['clients'] = $user->clients->pluck('id')->toArray(); return $data; } public static function store($data) { - - $id = isset($data['id']) ? $data['id'] : false; - - if (!empty($data['password'])) { - $data['password'] = Hash::make($data['password']); - } else { - if ($id) { - unset($data['password']); - } else { - $data['password'] = Hash::make(Str::random(8)); - } + if ($data['id'] ?? false) { + unset($data['password']); } - $data['remember_token'] = Str::random(32); - $data['active'] = true; - - $user = $id ? self::update($data, $id) : self::create($data); + $user = ($data['id'] ?? false) ? self::update($data) : self::create($data); $user->roles()->sync(array_keys($data['roles'] ?? [])); - - UserClients::associate($user->id, $data['clients'] ?? false ); - // $user->sendNewUserNotification($data['remember_token'], Auth::user()); - return $user; } - public static function create($data, $copy_password = false) + public static function create($data) { - $data['password'] = $copy_password ? $data['password'] : ($data['password'] ? Hash::make($data['password']) : Hash::make(Str::random(8))); + $data['password'] = $data['password'] ?? Hash::make($data['password']); + $data['remember_token'] = Str::random(32); + $data['active'] = true; $user = User::create($data); PasswordSecurities::create($user->id); return $user; @@ -208,7 +186,7 @@ class Users if (!$avatar) { return '/assets/img/no-avatar.png'; } - $path = Clients::isClient() ? Clients::getPublicPath('/images/avatars/') : Partners::getPublicPath('/images/avatars/'); + $path = '/images/avatars/'; return $path . $avatar; } @@ -242,16 +220,6 @@ class Users return User::byUsername($username)->withTrashed()->first(); } - public static function select_by_status_and_team_and_entity($status_id, $team_id, $third_party_id) - { - return User::active()->byStatus($status_id)->byTeam($team_id)->byThirdParty($third_party_id)->get()->toArray(); - } - - public static function select_datas_by_id($user_id) - { - return User::with('status')->find($user_id)->toArray(); - } - public static function toggle_active($id, $active) { return self::get($id)->update(['active' => $active]); @@ -276,14 +244,11 @@ class Users public static function update_password($id, $password) { $password = Hash::make($password); - UserClients::changePasswordsByUser($id, $password); return User::find($id)->update(['password' => $password]); - // $connection = app(Connection::class); - // return User::on($connection->systemName())->find($id)->update(['password' => $password]); } public static function validate($username, $field = 'current_password') { return PasswordRules::changePassword($username, $field); - } + } } diff --git a/app/Repositories/Shop/Articles.php b/app/Repositories/Shop/Articles.php index 01eeb90d..64b4259e 100644 --- a/app/Repositories/Shop/Articles.php +++ b/app/Repositories/Shop/Articles.php @@ -451,7 +451,7 @@ class Articles $tags[$tag['group']][] = $tag['name']; } } - return $tags; + return $tags ?? null; } public static function getPricesByArticle($article) diff --git a/app/Repositories/Shop/Homepages.php b/app/Repositories/Shop/Homepages.php index f7bc4cc1..a07c1ecd 100644 --- a/app/Repositories/Shop/Homepages.php +++ b/app/Repositories/Shop/Homepages.php @@ -18,6 +18,16 @@ class Homepages return self::get(1)->text; } + public static function getFooter() + { + return self::get(2)->text; + } + + public static function getExtraFooter() + { + return self::get(3)->text; + } + public static function get($id) { return Homepage::find($id); diff --git a/app/Repositories/Users.php b/app/Repositories/Users.php new file mode 100644 index 00000000..fb3def6e --- /dev/null +++ b/app/Repositories/Users.php @@ -0,0 +1,16 @@ +toArray(); + return $data; + } +} diff --git a/app/View/Composers/Shop/LayoutComposer.php b/app/View/Composers/Shop/LayoutComposer.php new file mode 100644 index 00000000..3f117bf0 --- /dev/null +++ b/app/View/Composers/Shop/LayoutComposer.php @@ -0,0 +1,14 @@ +with(Config::init()); + } +} diff --git a/build/css/site.css b/build/css/site.css index 2ecc82b9..9e67382c 100644 --- a/build/css/site.css +++ b/build/css/site.css @@ -51,8 +51,8 @@ a.green-dark:hover { background-color: #F2B90F; } -.bg-light { - background-color: #F5F5F5; +.bg-grey { + background-color: #AAA; } .yellow { diff --git a/resources/views/Shop/Articles/partials/ArticleAddBasket.blade.php b/resources/views/Shop/Articles/partials/ArticleAddBasket.blade.php index ff1ea6ae..145c7818 100644 --- a/resources/views/Shop/Articles/partials/ArticleAddBasket.blade.php +++ b/resources/views/Shop/Articles/partials/ArticleAddBasket.blade.php @@ -53,7 +53,7 @@ 'Ajout dans le panier', 'basket-form', "{{ route('Shop.Basket.modalBasket') }}/" + offer_id + '/' + quantity, - "{{ route('Shop.Orders.create') }}", + "{{ route('Shop.Orders.order') }}", false, false, true, diff --git a/resources/views/Shop/Baskets/basket.blade.php b/resources/views/Shop/Baskets/basket.blade.php index 3e246f1e..013440e1 100644 --- a/resources/views/Shop/Baskets/basket.blade.php +++ b/resources/views/Shop/Baskets/basket.blade.php @@ -28,47 +28,14 @@ @endforeach
- @component('components.card', ['class' => 'shadow bg-light']) -
-
- Tarif appliqué - -
-
- {{ $sale_channel['name'] ?? '' }} -
-
-
-
- ARTICLES -
-
- € -
-
-
-
- LIVRAISON -
-
- 5 € -
-
-
-
-
- TOTAL TTC -
-
- € -
-
+ + @include('Shop.Baskets.partials.basketTotal')
- COMMANDER + COMMANDER
- @endcomponent +
@endif diff --git a/resources/views/Shop/Baskets/partials/basketTotal.blade.php b/resources/views/Shop/Baskets/partials/basketTotal.blade.php new file mode 100644 index 00000000..da3ce417 --- /dev/null +++ b/resources/views/Shop/Baskets/partials/basketTotal.blade.php @@ -0,0 +1,35 @@ +
+
+ Tarif appliqué : +
+
+ + {{ $sale_channel['name'] ?? null }} + +
+
+
+
+ {{ $basket['count'] ?? 0 }} ARTICLES +
+
+ {{ $basket['total'] ?? 0 }} € +
+
+
+
+ LIVRAISON +
+
+ 5 € +
+
+
+
+
+ TOTAL TTC +
+
+ {{ ($basket['total'] ?? 0) + 5 }} € +
+
\ No newline at end of file diff --git a/resources/views/Shop/Orders/order.blade.php b/resources/views/Shop/Orders/order.blade.php new file mode 100644 index 00000000..50ecf4cb --- /dev/null +++ b/resources/views/Shop/Orders/order.blade.php @@ -0,0 +1,43 @@ +@extends('Shop.layout.layout', [ + 'title' => __('Commande'), +]) + +@section('content') +
+
+ Déja client ? + + + + @include('Shop.auth.partials.login') + + + + @include('Shop.auth.partials.register') + + + + + + + + + + + + + + +
+
+ + @include('Shop.Baskets.partials.basketTotal') + +
+
+@endsection + +@push('js') + +@endpush \ No newline at end of file diff --git a/resources/views/Shop/Shelves/partials/category_articles.blade.php b/resources/views/Shop/Shelves/partials/category_articles.blade.php index 15e316ac..568230b4 100644 --- a/resources/views/Shop/Shelves/partials/category_articles.blade.php +++ b/resources/views/Shop/Shelves/partials/category_articles.blade.php @@ -1,9 +1,11 @@
@if ($articles ?? false) @foreach ($articles as $product_name => $article) + @if ((($product_type == 'botanic') && (($article['semences'] ?? false) || ($article['plants'] ?? false))) || (($product_type == 'merchandise') &&($article['mercchandises'] ?? false)))
@include('Shop.Articles.partials.article')
+ @endif @endforeach @endif
\ No newline at end of file diff --git a/resources/views/Shop/auth/login.blade.php b/resources/views/Shop/auth/login.blade.php index 444c02ca..0153e3f4 100644 --- a/resources/views/Shop/auth/login.blade.php +++ b/resources/views/Shop/auth/login.blade.php @@ -4,45 +4,14 @@ ]) @section('content') - {!! Form::open(['route' => 'Shop.login.post', 'method' => 'post', 'autocomplete'=> 'off']) !!} -
-
- -
-
- -
-
- {{ Form::email('email', old('email'), ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.email'), 'required', 'autofocus']) }} - - {!! $errors->first('email','

:message

') !!} -
-
-
-
- {{ Form::password('password', ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.password')]) }} - - {!! $errors->first('password','

:message

') !!} -
-
-
-
- -
-
- {{ __('Mot de passe oublié ?') }}
- -
+
+
+
- {!! Form::close() !!} +
+ + @include('Shop.auth.partials.login')

Vous n'avez pas encore de compte ? diff --git a/resources/views/Shop/auth/loginbox.blade.php b/resources/views/Shop/auth/loginbox.blade.php deleted file mode 100644 index 36c4e62d..00000000 --- a/resources/views/Shop/auth/loginbox.blade.php +++ /dev/null @@ -1,8 +0,0 @@ -@if (config('app.name') == 'CRM') - @include('auth.crm') - -@endif - -@if (config('app.name') == 'HestImmo') - @include('auth.hestimmo') -@endif diff --git a/resources/views/Shop/auth/partials/login.blade.php b/resources/views/Shop/auth/partials/login.blade.php new file mode 100644 index 00000000..87979ac7 --- /dev/null +++ b/resources/views/Shop/auth/partials/login.blade.php @@ -0,0 +1,34 @@ +{!! Form::open(['route' => 'Shop.login.post', 'method' => 'post', 'autocomplete'=> 'off']) !!} + +

+
+ {{ Form::email('email', old('email'), ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.email'), 'required', 'autofocus']) }} + + {!! $errors->first('email','

:message

') !!} +
+
+
+
+ {{ Form::password('password', ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.password')]) }} + + {!! $errors->first('password','

:message

') !!} +
+
+
+
+ +
+ +
+ {{ __('Mot de passe oublié ?') }}
+ +
+
+{!! Form::close() !!} diff --git a/resources/views/Shop/auth/partials/register.blade.php b/resources/views/Shop/auth/partials/register.blade.php new file mode 100644 index 00000000..1190efb9 --- /dev/null +++ b/resources/views/Shop/auth/partials/register.blade.php @@ -0,0 +1,117 @@ +{!! Form::open(['route' => 'Shop.register.post', 'method' => 'post', 'autocomplete'=> 'off']) !!} +
+
+ +
+
+
+ {{ Form::text('first_name', old('first_name'), ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.first_name'), 'required', 'autofocus']) }} + {!! $errors->first('first_name','

:message

') !!} +
+
+
+
+ {{ Form::text('last_name', old('last_name'), ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.last_name'), 'required']) }} + {!! $errors->first('last_name','

:message

') !!} +
+
+
+
+
+
+ {{ Form::text('company', old('company'), ['class' => 'form-control', 'placeholder' => __('Société'), 'autofocus']) }} + {!! $errors->first('company','

:message

') !!} +
+
+
+
+
+
+ {{ Form::text('tva', old('tva'), ['class' => 'form-control', 'placeholder' => __('N° de TVA'), 'autofocus']) }} + {!! $errors->first('tva','

:message

') !!} +
+
+
+
+
+
+ {{ Form::email('email', old('email'), ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.email'), 'required']) }} + {!! $errors->first('email','

:message

') !!} +
+
+
+
+ {{ Form::text('phone', old('phone'), ['class' => 'form-control', 'placeholder' => __('phone')]) }} + {!! $errors->first('phone','

:message

') !!} +
+
+
+ +
+
+
+ {{ Form::text('address', old('address'), ['class' => 'form-control', 'placeholder' => __('Adresse de livraison'), 'required']) }} + {!! $errors->first('address','

:message

') !!} +
+
+
+ +
+
+
+ {{ Form::text('address2', old('address2'), ['class' => 'form-control', 'placeholder' => __('Complément d\'adresse'), 'required']) }} + {!! $errors->first('address2','

:message

') !!} +
+
+
+ +
+
+
+ {{ Form::text('zipcode', old('zipcode'), ['class' => 'form-control', 'placeholder' => __('zipcode'), 'required']) }} + {!! $errors->first('zipcode','

:message

') !!} +
+
+
+
+ {{ Form::text('city', old('city'), ['class' => 'form-control', 'placeholder' => __('city'), 'required']) }} + {!! $errors->first('city','

:message

') !!} +
+
+
+ +
+
+
+ {{ Form::password('password', ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.password'), 'required']) }} + {!! $errors->first('password','

:message

') !!} +
+
+
+
+ {{ Form::password('password_confirmation', ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.password_confirm'), 'required']) }} + {!! $errors->first('password_confirmation','

:message

') !!} +
+
+
+ +
+
+ @include('components.form.checkbox', ['name' => 'use_for_invoice', 'value' => false]) + Utiliser aussi cette adresse pour la facturation +
+
+ + + +
+
+ +
+
+ +
+
+{!! Form::close() !!} diff --git a/resources/views/Shop/auth/register.blade.php b/resources/views/Shop/auth/register.blade.php index 4979ccf2..af1ea2b2 100644 --- a/resources/views/Shop/auth/register.blade.php +++ b/resources/views/Shop/auth/register.blade.php @@ -4,97 +4,5 @@ ]) @section('content') - {!! Form::open(['route' => 'Shop.register.post', 'method' => 'post', 'autocomplete'=> 'off']) !!} -
-
- @component('components.card', ['title' => 'Créez votre compte', 'class' => 'mt-3 mb-3']) -
-
-
- {{ Form::text('first_name', old('first_name'), ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.first_name'), 'required', 'autofocus']) }} - {!! $errors->first('first_name','

:message

') !!} -
-
-
-
- {{ Form::text('last_name', old('last_name'), ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.last_name'), 'required']) }} - {!! $errors->first('last_name','

:message

') !!} -
-
-
-
-
-
- {{ Form::email('email', old('email'), ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.email'), 'required']) }} - {!! $errors->first('email','

:message

') !!} -
-
-
-
- {{ Form::text('phone', old('phone'), ['class' => 'form-control', 'placeholder' => __('phone'), 'required']) }} - {!! $errors->first('phone','

:message

') !!} -
-
-
- -
-
-
- {{ Form::text('address', old('address'), ['class' => 'form-control', 'placeholder' => __('Adresse'), 'required']) }} - {!! $errors->first('address','

:message

') !!} -
-
-
- -
-
-
- {{ Form::text('address2', old('address2'), ['class' => 'form-control', 'placeholder' => __('Complément d\'adresse'), 'required']) }} - {!! $errors->first('address2','

:message

') !!} -
-
-
- -
-
-
- {{ Form::text('zipcode', old('zipcode'), ['class' => 'form-control', 'placeholder' => __('zipcode'), 'required']) }} - {!! $errors->first('zipcode','

:message

') !!} -
-
-
-
- {{ Form::text('city', old('city'), ['class' => 'form-control', 'placeholder' => __('city'), 'required']) }} - {!! $errors->first('city','

:message

') !!} -
-
-
- -
-
-
- {{ Form::password('password', ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.password'), 'required']) }} - {!! $errors->first('password','

:message

') !!} -
-
-
-
- {{ Form::password('password_confirmation', ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.password_confirm'), 'required']) }} - {!! $errors->first('password_confirmation','

:message

') !!} -
-
-
- @endcomponent - -
-
- -
-
- -
-
- {!! Form::close() !!} + @include('Shop.auth.partials.register') @endsection diff --git a/resources/views/Shop/layout/partials/footer.blade.php b/resources/views/Shop/layout/partials/footer.blade.php index 4249b47e..2811475a 100644 --- a/resources/views/Shop/layout/partials/footer.blade.php +++ b/resources/views/Shop/layout/partials/footer.blade.php @@ -1,3 +1,5 @@ diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index d72f9569..2824af46 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -4,43 +4,11 @@ ]) @section('content') - {!! Form::open(['route' => 'boilerplate.login', 'method' => 'post', 'autocomplete'=> 'off']) !!} -
-
- -
+
+
+
- -
-
- {{ Form::email('email', old('email'), ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.email'), 'required', 'autofocus']) }} - - {!! $errors->first('email','

:message

') !!} -
-
-
-
- {{ Form::password('password', ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.password')]) }} - - {!! $errors->first('password','

:message

') !!} -
-
-
-
-
- -
-
-
- -
-
- {!! Form::close() !!} - {{ __('boilerplate::auth.login.forgotpassword') }}
- @if(config('boilerplate.auth.register')) - {{ __('boilerplate::auth.login.register') }} - @endif +
+ + @include('auth.partials.login') @endsection diff --git a/resources/views/auth/loginbox.blade.php b/resources/views/auth/loginbox.blade.php deleted file mode 100644 index 36c4e62d..00000000 --- a/resources/views/auth/loginbox.blade.php +++ /dev/null @@ -1,8 +0,0 @@ -@if (config('app.name') == 'CRM') - @include('auth.crm') - -@endif - -@if (config('app.name') == 'HestImmo') - @include('auth.hestimmo') -@endif diff --git a/resources/views/auth/partials/login.blade.php b/resources/views/auth/partials/login.blade.php new file mode 100644 index 00000000..0d255f62 --- /dev/null +++ b/resources/views/auth/partials/login.blade.php @@ -0,0 +1,35 @@ +{!! Form::open(['route' => 'boilerplate.login', 'method' => 'post', 'autocomplete'=> 'off']) !!} + +
+
+ {{ Form::email('email', old('email'), ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.email'), 'required', 'autofocus']) }} + + {!! $errors->first('email','

:message

') !!} +
+
+
+
+ {{ Form::password('password', ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.password')]) }} + + {!! $errors->first('password','

:message

') !!} +
+
+
+
+
+ +
+
+
+ +
+
+{!! Form::close() !!} + +{{ __('boilerplate::auth.login.forgotpassword') }}
+@if(config('boilerplate.auth.register')) + {{ __('boilerplate::auth.login.register') }} +@endif diff --git a/resources/views/components/layout/collapse.blade.php b/resources/views/components/layout/collapse.blade.php new file mode 100644 index 00000000..670ad055 --- /dev/null +++ b/resources/views/components/layout/collapse.blade.php @@ -0,0 +1,29 @@ +
+
+
+
+ + {!! $title ?? null !!} + @if (isset($required) && $required) + * + @endif + + {!! $collapse_left ?? '' !!} + + +
+ @if ($collapse_right ?? false) +
+ {!! $collapse_right ?? '' !!} +
+ @endif +
+
+
+ {{ $slot }} +
+
+ +@include('load.layout.chevron') diff --git a/resources/views/layout/contentheader.blade.php b/resources/views/layout/contentheader.blade.php index fb5ab326..544ce7ca 100644 --- a/resources/views/layout/contentheader.blade.php +++ b/resources/views/layout/contentheader.blade.php @@ -3,12 +3,10 @@

- @if(isset($title)) - {{ $title }} - @endif - @if(isset($subtitle)) + {{ $title ?? null}} + @isset($subtitle) {{ $subtitle }} - @endif + @endisset

diff --git a/routes/Shop/Orders.php b/routes/Shop/Orders.php index 9c009df7..6b48ad4d 100644 --- a/routes/Shop/Orders.php +++ b/routes/Shop/Orders.php @@ -1,11 +1,6 @@ name('Orders.')->group(function () { - Route::get('', 'OrderController@index')->name('index'); - Route::get('create', 'OrderController@create')->name('create'); - Route::delete('destroy', 'OrderController@destroy')->name('destroy'); - Route::post('update', 'OrderController@update')->name('update'); - Route::post('store', 'OrderController@store')->name('store'); - Route::get('edit/{id}', 'OrderController@edit')->name('edit'); + Route::get('order', 'OrderController@order')->name('order'); });