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

fix on customer auth, fix filters on shelves, refactor for article_nature, add slug

Browse Source
This commit is contained in:
ludo
2023-10-17 17:20:30 +02:00
parent 50d5d6944d
commit f3b9db1a6f
30 changed files with 1205 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/Admin/Shop/ArticleNatureController.php
View File

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Admin\Shop;
use App\Datatables\Admin\Shop\ArticleNaturesDataTable;
use App\Repositories\Shop\ArticleNatures;
use Illuminate\Http\Request;
use Illuminate\Support\Str;
class ArticleNatureController extends Controller
{
@@ -20,8 +21,11 @@ class ArticleNatureController extends Controller
public function store(Request $request)
{
$data = $request->all();
$data['slug'] = Str::slug($data['name'], '-');
$articleNature = ArticleNatures::store($request->all());
ArticleNatures::storeIcon($articleNature, $request->file('icon'));
ArticleNatures::storeIcon($articleNature, $request->file('icon'), 'icon');
ArticleNatures::storeIcon($articleNature, $request->file('icon_selection'), 'icon_selection');
return redirect()->route('Admin.Shop.ArticleNatures.index');
}
@@ -41,7 +45,8 @@ class ArticleNatureController extends Controller
'article_nature' => ArticleNatures::get($id),
'product_types' => ArticleNatures::getProductTypes(),
];
$data['article_nature']['icon'] = ArticleNatures::getIcon($id);
$data['article_nature']['icon'] = ArticleNatures::getIcon($id, 'normal', 'icon');
$data['article_nature']['icon_selection'] = ArticleNatures::getIcon($id, 'normal', 'icon_selection');
return view('Admin.Shop.ArticleNatures.edit', $data);
}

2
app/Http/Controllers/Admin/Shop/MerchandiseController.php
View File

@@ -2,7 +2,7 @@
namespace App\Http\Controllers\Admin\Shop;
use App\Datatables\Shop\MerchandisesDataTable;
use App\Datatables\Admin\Shop\MerchandisesDataTable;
use App\Repositories\Shop\Merchandises;
use App\Repositories\Shop\Producers;
use App\Repositories\Shop\TagGroups;

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

@@ -19,25 +19,17 @@ class CategoryController extends Controller
public function show(Request $request, $categoryId, $articleNatureId = false)
{
$productTypes = Articles::getProductTypesWithOffers([
'category_id' => $categoryId,
]);
$articleNatures = Articles::getArticleNaturesWithOffers([
'category_id' => $categoryId,
]);
if ($articleNatureId) {
$productType = ArticleNatures::getProductType($articleNatureId);
dump($productType);
exit;
} else {
$articleNature = $request->input('article_nature');
if (! $articleNature) {
if (count($articleNatures) === 1) {
if (count($articleNatures)) {
$articleNature = $articleNatures[0];
} else {
$articleNature = 'semences';
}
}
$productType = ArticleNatures::getProductTypeBySlug($articleNature);
@@ -61,7 +53,7 @@ class CategoryController extends Controller
'tags' => TagGroups::getWithTagsAndCountOffers($categoryId),
];
// dump($data);
dump($data);
// exit;
return view('Shop.Shelves.shelve', $data);
}

14
app/Http/Controllers/Shop/CustomerController.php
View File

@@ -11,9 +11,7 @@ class CustomerController extends Controller
{
public function profile($id = false)
{
$data = Customers::editProfile($id);
return view('Shop.Customers.profile', $data);
return view('Shop.Customers.profile', Customers::editProfile($id));
}
public function modalProfile($id = false)
@@ -25,16 +23,14 @@ class CustomerController extends Controller
public function edit()
{
$id = Auth::id();
$data['customer'] = Customers::get($id, 'addresses')->toArray();
return view('Shop.Customers.edit', $data);
return view('Shop.Customers.edit', [
'customer' => Customers::getArray(Auth::id(), 'addresses'),
]);
}
public function storeProfileAjax(Request $request)
{
$data = $request->all();
$customer = Customers::store($data);
$customer = Customers::store($request->all());
return response()->json(['error' => 0]);
}

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

@@ -37,6 +37,7 @@ class OrderController extends Controller
{
if (ShopCart::count()) {
$customer = Customers::getWithAddresses();
$data = [
'customer' => $customer ? $customer->toArray() : false,
'basket' => ShopCart::getSummary(),