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

add validator, optimizations

Browse Source
This commit is contained in:
ludo
2023-11-13 23:03:12 +01:00
parent 23ac0cedad
commit b86b043604
16 changed files with 207 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/Admin/Shop/ArticleController.php
View File

@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Admin\Shop;
use App\Datatables\Admin\Shop\ArticlesDataTable;
use App\Http\Requests\Admin\Shop\StoreArticlePost;
use App\Repositories\Shop\ArticleNatures;
use App\Repositories\Shop\Articles;
use App\Repositories\Shop\Categories;
@@ -20,9 +21,11 @@ class ArticleController extends Controller
public function index(ArticlesDataTable $dataTable)
{
$data['article_natures'] = ArticleNatures::getOptions();
$data['categories'] = Categories::getOptions();
$data['tags'] = Tags::getOptionsFullName();
$data = [
'article_natures' => ArticleNatures::getOptions(),
'categories' => Categories::getOptions(),
'tags' => Tags::getOptionsFullName(),
];
return $dataTable->render('Admin.Shop.Articles.list', $data);
}
@@ -34,9 +37,12 @@ class ArticleController extends Controller
return view('Admin.Shop.Articles.create', $data);
}
public function store(Request $request)
public function store(StoreArticlePost $request)
{
$data = $request->all();
$data['visible'] = $data['visible'] ?? false;
$data['homepage'] = $data['homepage'] ?? false;
Articles::storeFull($data);
return redirect()->route('Admin.Shop.Articles.index');

21
app/Http/Controllers/Admin/Shop/OfferController.php
View File

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Admin\Shop;
use App\Datatables\Admin\Shop\OffersDataTable;
use App\Http\Controllers\Controller;
use App\Http\Requests\Admin\Shop\StoreOfferPost;
use App\Repositories\Shop\ArticleNatures;
use App\Repositories\Shop\Articles;
use App\Repositories\Shop\Offers;
@@ -16,32 +17,30 @@ class OfferController extends Controller
{
public function index(OffersDataTable $dataTable)
{
$data['article_natures'] = ArticleNatures::getOptions();
$data['packages'] = Packages::getOptions();
$data = [
'article_natures' => ArticleNatures::getOptions(),
'packages' => Packages::getOptions(),
];
return $dataTable->render('Admin.Shop.Offers.list', $data ?? []);
}
public function create()
{
$data['articles'] = Articles::getOptionsWithNature();
$data['tariffs'] = Tariffs::getOptions();
$data['variations'] = Variations::getOptions();
$data = Offers::init();
return view('Admin.Shop.Offers.create', $data);
}
public function edit($id)
{
$data['offer'] = Offers::get($id)->toArray();
$data['articles'] = Articles::getOptionsWithNature();
$data['tariffs'] = Tariffs::getOptions();
$data['variations'] = Variations::getOptions();
$data = Offers::init();
$data['offer'] = Offers::getArray($id);
return view('Admin.Shop.Offers.edit', $data);
}
public function store(Request $request)
public function store(StoreOfferPost $request)
{
$data = $request->all();
$ret = Offers::store($data);
@@ -51,7 +50,7 @@ class OfferController extends Controller
public function show($id)
{
$data['offer'] = Offers::get($id)->toArray();
$data['offer'] = Offers::getArray($id);
return view('Admin.Shop.Offers.view', $data);
}

3
app/Http/Requests/Admin/Shop/StoreArticlePost.php
View File

@@ -14,10 +14,11 @@ class StoreArticlePost extends FormRequest
public function rules()
{
return [
'ref' => 'required|unique:articles,ref,'.$this->ref,
'ref' => 'required|unique:shop_articles,ref,'.$this->id,
'product_type' => 'required',
'product_id' => 'required',
'article_nature_id' => 'required',
'name' => 'required',
];
}
}

23
app/Http/Requests/Admin/Shop/StoreOfferPost.php Normal file
View File

@@ -0,0 +1,23 @@
<?php
namespace App\Http\Requests\Admin\Shop;
use Illuminate\Foundation\Http\FormRequest;
class StoreOfferPost extends FormRequest
{
public function authorize()
{
return true;
}
public function rules()
{
return [
'article_id' => 'required',
'variation_id' => 'required',
'tariff_id' => 'required',
'weight' => 'required',
];
}
}