jev/opensem
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

begin order form with registration

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2022-06-26 23:33:39 +02:00
parent d50ecd674e
commit 8054bffb43
36 changed files with 442 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Admin/Shop/HomepageController.php
View File

@@ -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);
}

8
app/Http/Controllers/Controller.php
View File

@@ -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;
}
}

1
app/Http/Controllers/Shop/ArticleController.php
View File

@@ -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);
}

2
app/Http/Controllers/Shop/Auth/RegisterController.php
View File

@@ -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!');
}
}

5
app/Http/Controllers/Shop/BasketController.php
View File

@@ -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);
}

32
app/Http/Controllers/Shop/CategoryController.php
View File

@@ -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);
}

4
app/Http/Controllers/Shop/Controller.php
View File

@@ -6,8 +6,4 @@ use App\Http\Controllers\Controller as ParentController;
class Controller extends ParentController
{
public function __construct()
{
// $this->middleware('auth:guest');
}
}

16
app/Http/Controllers/Shop/HomeController.php
View File

@@ -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);
}
}

80
app/Http/Controllers/Shop/OrderController.php
View File

@@ -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);
}
}

11
app/Http/Controllers/Shop/SearchController.php
View File

@@ -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);
}
}