rename models and associates, isolate botanic with shop
This commit is contained in:
@@ -1,11 +1,11 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Shop\Admin;
|
||||
namespace App\Http\Controllers\Botanic\Admin;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use App\Http\Controllers\Controller;
|
||||
|
||||
use App\Repositories\Shop\Families;
|
||||
use App\Repositories\Botanic\Families;
|
||||
use App\DataTables\FamiliesDataTable;
|
||||
|
||||
class FamilyController extends Controller
|
||||
@@ -13,7 +13,7 @@ class FamilyController extends Controller
|
||||
|
||||
public function index(FamiliesDataTable $dataTable)
|
||||
{
|
||||
return $dataTable->render('Shop.Admin.Families.list');
|
||||
return $dataTable->render('Botanic.Admin.Families.list');
|
||||
}
|
||||
|
||||
public function getDatatable(Request $request)
|
||||
@@ -24,25 +24,25 @@ class FamilyController extends Controller
|
||||
public function create()
|
||||
{
|
||||
$data = [];
|
||||
return view('Shop.Admin.Families.create', $data);
|
||||
return view('Botanic.Admin.Families.create', $data);
|
||||
}
|
||||
|
||||
public function store(Request $request)
|
||||
{
|
||||
$ret = Families::store($request);
|
||||
return redirect()->route('Shop.Admin.Families.index');
|
||||
return redirect()->route('Botanic.Admin.Families.index');
|
||||
}
|
||||
|
||||
public function show($id)
|
||||
{
|
||||
$data = Families::get($id);
|
||||
return view('Shop.Admin.Families.view', $data);
|
||||
return view('Botanic.Admin.Families.view', $data);
|
||||
}
|
||||
|
||||
public function edit($id)
|
||||
{
|
||||
$data['family'] = Families::get($id)->toArray();
|
||||
return view('Shop.Admin.Families.edit', $data);
|
||||
return view('Botanic.Admin.Families.edit', $data);
|
||||
}
|
||||
|
||||
public function destroy($id)
|
||||
@@ -1,19 +1,19 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Shop\Admin;
|
||||
namespace App\Http\Controllers\Botanic\Admin;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use App\Http\Controllers\Controller;
|
||||
|
||||
use App\Repositories\Shop\Genres;
|
||||
use App\Repositories\Shop\Families;
|
||||
use App\Repositories\Botanic\Genres;
|
||||
use App\Repositories\Botanic\Families;
|
||||
use App\DataTables\GenresDataTable;
|
||||
|
||||
class GenreController extends Controller
|
||||
{
|
||||
public function index(GenresDataTable $dataTable)
|
||||
{
|
||||
return $dataTable->render('Shop.Admin.Genres.list');
|
||||
return $dataTable->render('Botanic.Admin.Genres.list');
|
||||
}
|
||||
|
||||
public function getDatatable(Request $request)
|
||||
@@ -23,26 +23,26 @@ class GenreController extends Controller
|
||||
|
||||
public function create()
|
||||
{
|
||||
return view('Shop.Admin.Genres.create');
|
||||
return view('Botanic.Admin.Genres.create');
|
||||
}
|
||||
|
||||
public function store(Request $request)
|
||||
{
|
||||
$ret = Genres::store($request);
|
||||
return redirect()->route('Shop.Admin.Genres.index');
|
||||
return redirect()->route('Botanic.Admin.Genres.index');
|
||||
}
|
||||
|
||||
public function show($id)
|
||||
{
|
||||
$data = Genres::get($id);
|
||||
return view('Shop.Admin.Genres.view', $data);
|
||||
return view('Botanic.Admin.Genres.view', $data);
|
||||
}
|
||||
|
||||
public function edit($id)
|
||||
{
|
||||
$data = Genres::get($id);
|
||||
$data['families'] = Families::getOptions();
|
||||
return view('Shop.Admin.Genres.edit', $data);
|
||||
return view('Botanic.Admin.Genres.edit', $data);
|
||||
}
|
||||
|
||||
public function destroy($id)
|
||||
@@ -1,19 +1,19 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Shop\Admin;
|
||||
namespace App\Http\Controllers\Botanic\Admin;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use App\Http\Controllers\Controller;
|
||||
|
||||
use App\Repositories\Shop\Species;
|
||||
use App\Repositories\Shop\Genres;
|
||||
use App\Repositories\Botanic\Species;
|
||||
use App\Repositories\Botanic\Genres;
|
||||
use App\DataTables\SpeciesDataTable;
|
||||
|
||||
class SpecieController extends Controller
|
||||
{
|
||||
public function index(SpeciesDataTable $dataTable)
|
||||
{
|
||||
return $dataTable->render('Shop.Admin.Species.list');
|
||||
return $dataTable->render('Botanic.Admin.Species.list');
|
||||
}
|
||||
|
||||
public function getDatatable(Request $request)
|
||||
@@ -23,26 +23,26 @@ class SpecieController extends Controller
|
||||
|
||||
public function create()
|
||||
{
|
||||
return view('Shop.Admin.Species.create');
|
||||
return view('Botanic.Admin.Species.create');
|
||||
}
|
||||
|
||||
public function store(Request $request)
|
||||
{
|
||||
$ret = Species::store($request);
|
||||
return redirect()->route('Shop.Admin.Species.index');
|
||||
return redirect()->route('Botanic.Admin.Species.index');
|
||||
}
|
||||
|
||||
public function show($id)
|
||||
{
|
||||
$data = Species::get($id);
|
||||
return view('Shop.Admin.Species.view', $data);
|
||||
return view('Botanic.Admin.Species.view', $data);
|
||||
}
|
||||
|
||||
public function edit($id)
|
||||
{
|
||||
$data = Species::get($id);
|
||||
$data['genres'] = Genres::getOptions();
|
||||
return view('Shop.Admin.Species.edit', $data);
|
||||
return view('Botanic.Admin.Species.edit', $data);
|
||||
}
|
||||
|
||||
public function destroy($id)
|
||||
@@ -1,19 +1,19 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Shop\Admin;
|
||||
namespace App\Http\Controllers\Botanic\Admin;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use App\Http\Controllers\Controller;
|
||||
|
||||
use App\Repositories\Shop\Varieties;
|
||||
use App\Repositories\Shop\Species;
|
||||
use App\Repositories\Botanic\Varieties;
|
||||
use App\Repositories\Botanic\Species;
|
||||
use App\DataTables\VarietiesDataTable;
|
||||
|
||||
class VarietyController extends Controller
|
||||
{
|
||||
public function index(VarietiesDataTable $dataTable)
|
||||
{
|
||||
return $dataTable->render('Shop.Admin.Varieties.list');
|
||||
return $dataTable->render('Botanic.Admin.Varieties.list');
|
||||
}
|
||||
|
||||
public function getDatatable(Request $request)
|
||||
@@ -23,26 +23,26 @@ class VarietyController extends Controller
|
||||
|
||||
public function create()
|
||||
{
|
||||
return view('Shop.Admin.Varieties.create');
|
||||
return view('Botanic.Admin.Varieties.create');
|
||||
}
|
||||
|
||||
public function store(Request $request)
|
||||
{
|
||||
$ret = Varieties::store($request);
|
||||
return redirect()->route('Shop.Admin.Varieties.index');
|
||||
return redirect()->route('Botanic.Admin.Varieties.index');
|
||||
}
|
||||
|
||||
public function show($id)
|
||||
{
|
||||
$data = Varieties::get($id);
|
||||
return view('Shop.Admin.Varieties.view', $data);
|
||||
return view('Botanic.Admin.Varieties.view', $data);
|
||||
}
|
||||
|
||||
public function edit($id)
|
||||
{
|
||||
$data = Varieties::get($id);
|
||||
$data['species'] = Species::getOptions();
|
||||
return view('Shop.Admin.Varieties.edit', $data);
|
||||
return view('Botanic.Admin.Varieties.edit', $data);
|
||||
}
|
||||
|
||||
public function destroy($id)
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
namespace App\Http\Controllers\Shop\Admin;
|
||||
|
||||
use App\ProductAttribute;
|
||||
use App\Model\Shop\ArticleAttribute;
|
||||
use Illuminate\Http\Request;
|
||||
use App\Http\Controllers\Controller;
|
||||
|
||||
class ProductAttributeController extends Controller
|
||||
class ArticleAttributeController extends Controller
|
||||
{
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
@@ -42,10 +42,10 @@ class ProductAttributeController extends Controller
|
||||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param \App\ProductAttribute $productAttribute
|
||||
* @param \App\ArticleAttribute $ArticleAttribute
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function show(ProductAttribute $productAttribute)
|
||||
public function show(ArticleAttribute $ArticleAttribute)
|
||||
{
|
||||
//
|
||||
}
|
||||
@@ -53,10 +53,10 @@ class ProductAttributeController extends Controller
|
||||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
* @param \App\ProductAttribute $productAttribute
|
||||
* @param \App\ArticleAttribute $ArticleAttribute
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function edit(ProductAttribute $productAttribute)
|
||||
public function edit(ArticleAttribute $ArticleAttribute)
|
||||
{
|
||||
//
|
||||
}
|
||||
@@ -65,10 +65,10 @@ class ProductAttributeController extends Controller
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \App\ProductAttribute $productAttribute
|
||||
* @param \App\ArticleAttribute $ArticleAttribute
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function update(Request $request, ProductAttribute $productAttribute)
|
||||
public function update(Request $request, ArticleAttribute $ArticleAttribute)
|
||||
{
|
||||
//
|
||||
}
|
||||
@@ -76,10 +76,10 @@ class ProductAttributeController extends Controller
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param \App\ProductAttribute $productAttribute
|
||||
* @param \App\ArticleAttribute $ArticleAttribute
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function destroy(ProductAttribute $productAttribute)
|
||||
public function destroy(ArticleAttribute $ArticleAttribute)
|
||||
{
|
||||
//
|
||||
}
|
||||
@@ -2,11 +2,13 @@
|
||||
|
||||
namespace App\Http\Controllers\Shop\Admin;
|
||||
|
||||
use App\Product;
|
||||
use Illuminate\Http\Request;
|
||||
use App\Http\Controllers\Controller;
|
||||
|
||||
class ProductController extends Controller
|
||||
use App\Models\Shop\Article;
|
||||
use App\Repositories\Shop\Articles;
|
||||
|
||||
class ArticleController extends Controller
|
||||
{
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
@@ -42,10 +44,10 @@ class ProductController extends Controller
|
||||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param \App\Product $product
|
||||
* @param \App\Article $Article
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function show(Product $product)
|
||||
public function show(Article $Article)
|
||||
{
|
||||
//
|
||||
}
|
||||
@@ -53,10 +55,10 @@ class ProductController extends Controller
|
||||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
* @param \App\Product $product
|
||||
* @param \App\Article $Article
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function edit(Product $product)
|
||||
public function edit(Article $Article)
|
||||
{
|
||||
//
|
||||
}
|
||||
@@ -65,10 +67,10 @@ class ProductController extends Controller
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \App\Product $product
|
||||
* @param \App\Article $Article
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function update(Request $request, Product $product)
|
||||
public function update(Request $request, Article $Article)
|
||||
{
|
||||
//
|
||||
}
|
||||
@@ -76,10 +78,10 @@ class ProductController extends Controller
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param \App\Product $product
|
||||
* @param \App\Article $Article
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function destroy(Product $product)
|
||||
public function destroy(Article $Article)
|
||||
{
|
||||
//
|
||||
}
|
||||
@@ -2,11 +2,13 @@
|
||||
|
||||
namespace App\Http\Controllers\Shop\Admin;
|
||||
|
||||
use App\ProductPrice;
|
||||
use Illuminate\Http\Request;
|
||||
use App\Http\Controllers\Controller;
|
||||
|
||||
class ProductPriceController extends Controller
|
||||
use App\Models\Shop\ArticlePrice;
|
||||
use App\Repositories\Shop\ArticlePrices;
|
||||
|
||||
class ArticlePriceController extends Controller
|
||||
{
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
@@ -42,10 +44,10 @@ class ProductPriceController extends Controller
|
||||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param \App\ProductPrice $productPrice
|
||||
* @param \App\ArticlePrice $ArticlePrice
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function show(ProductPrice $productPrice)
|
||||
public function show(ArticlePrice $ArticlePrice)
|
||||
{
|
||||
//
|
||||
}
|
||||
@@ -53,10 +55,10 @@ class ProductPriceController extends Controller
|
||||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
* @param \App\ProductPrice $productPrice
|
||||
* @param \App\ArticlePrice $ArticlePrice
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function edit(ProductPrice $productPrice)
|
||||
public function edit(ArticlePrice $ArticlePrice)
|
||||
{
|
||||
//
|
||||
}
|
||||
@@ -65,10 +67,10 @@ class ProductPriceController extends Controller
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \App\ProductPrice $productPrice
|
||||
* @param \App\ArticlePrice $ArticlePrice
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function update(Request $request, ProductPrice $productPrice)
|
||||
public function update(Request $request, ArticlePrice $ArticlePrice)
|
||||
{
|
||||
//
|
||||
}
|
||||
@@ -76,10 +78,10 @@ class ProductPriceController extends Controller
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param \App\ProductPrice $productPrice
|
||||
* @param \App\ArticlePrice $ArticlePrice
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function destroy(ProductPrice $productPrice)
|
||||
public function destroy(ArticlePrice $ArticlePrice)
|
||||
{
|
||||
//
|
||||
}
|
||||
@@ -5,28 +5,20 @@ namespace App\Http\Controllers\Shop\Admin;
|
||||
use Illuminate\Http\Request;
|
||||
use App\Http\Controllers\Controller;
|
||||
|
||||
use App\Repositories\Shop\Sections;
|
||||
use App\Repositories\Shop\Categories;
|
||||
use App\DataTables\CategoriesDataTable;
|
||||
|
||||
class SectionController extends Controller
|
||||
class CategoryController extends Controller
|
||||
{
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
*
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function index(Request $request)
|
||||
|
||||
public function index(CategoriesDataTable $dataTable)
|
||||
{
|
||||
if ($request->ajax()) {
|
||||
return self::getDatatable($request);
|
||||
} else {
|
||||
$data = [];
|
||||
return view('Shop.Admin.Sections.list', $data);
|
||||
}
|
||||
}
|
||||
return $dataTable->render('Shop.Admin.Categories.list');
|
||||
}
|
||||
|
||||
public function getDatatable(Request $request)
|
||||
{
|
||||
return Sections::getTables($request->all());
|
||||
return Categories::getTables($request->all());
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -37,7 +29,7 @@ class SectionController extends Controller
|
||||
public function create()
|
||||
{
|
||||
$data = [];
|
||||
return view('Shop.Admin.Sections.create', $data);
|
||||
return view('Shop.Admin.Categories.create', $data);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -48,8 +40,8 @@ class SectionController extends Controller
|
||||
*/
|
||||
public function store(Request $request)
|
||||
{
|
||||
$ret = Sections::store($request);
|
||||
return redirect()->route('Shop.Admin.Sections.index');
|
||||
$ret = Categories::store($request);
|
||||
return redirect()->route('Shop.Admin.Categories.index');
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -60,8 +52,8 @@ class SectionController extends Controller
|
||||
*/
|
||||
public function show($id)
|
||||
{
|
||||
$data = Sections::get($id);
|
||||
return view('Shop.Admin.Sections.view', $data);
|
||||
$data = Categories::get($id);
|
||||
return view('Shop.Admin.Categories.view', $data);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -72,8 +64,8 @@ class SectionController extends Controller
|
||||
*/
|
||||
public function edit($id)
|
||||
{
|
||||
$data = Sections::get($id);
|
||||
return view('Shop.Admin.Sections.edit', $data);
|
||||
$data = Categories::get($id);
|
||||
return view('Shop.Admin.Categories.edit', $data);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -96,6 +88,6 @@ class SectionController extends Controller
|
||||
*/
|
||||
public function destroy($id)
|
||||
{
|
||||
return Sections::destroy($id);
|
||||
return Categories::destroy($id);
|
||||
}
|
||||
}
|
||||
@@ -5,9 +5,9 @@ namespace App\Http\Controllers\Shop;
|
||||
use Illuminate\Http\Request;
|
||||
use App\Http\Controllers\Controller;
|
||||
|
||||
use App\Repositories\Shop\Products;
|
||||
use App\Repositories\Shop\Articles;
|
||||
|
||||
class ProductController extends Controller
|
||||
class ArticleController extends Controller
|
||||
{
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
@@ -43,10 +43,10 @@ class ProductController extends Controller
|
||||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param \App\Product $product
|
||||
* @param \App\Article $article
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function show(Product $product)
|
||||
public function show($id)
|
||||
{
|
||||
//
|
||||
}
|
||||
@@ -54,10 +54,10 @@ class ProductController extends Controller
|
||||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
* @param \App\Product $product
|
||||
* @param \App\Article $article
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function edit(Product $product)
|
||||
public function edit($id)
|
||||
{
|
||||
//
|
||||
}
|
||||
@@ -66,10 +66,10 @@ class ProductController extends Controller
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \App\Product $product
|
||||
* @param \App\Article $article
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function update(Request $request, Product $product)
|
||||
public function update(Request $request, $id)
|
||||
{
|
||||
//
|
||||
}
|
||||
@@ -77,10 +77,10 @@ class ProductController extends Controller
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param \App\Product $product
|
||||
* @param \App\Article $article
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function destroy(Product $product)
|
||||
public function destroy($id)
|
||||
{
|
||||
//
|
||||
}
|
||||
@@ -5,9 +5,9 @@ namespace App\Http\Controllers\Shop;
|
||||
use Illuminate\Http\Request;
|
||||
use App\Http\Controllers\Controller;
|
||||
|
||||
use App\Repositories\Shop\Sections;
|
||||
use App\Repositories\Shop\Categorys;
|
||||
|
||||
class SectionController extends Controller
|
||||
class CategoryController extends Controller
|
||||
{
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
@@ -20,13 +20,13 @@ class SectionController extends Controller
|
||||
return self::getDatatable($request);
|
||||
} else {
|
||||
$data = [];
|
||||
return view('Shop.Sections.list', $data);
|
||||
return view('Shop.Categories.list', $data);
|
||||
}
|
||||
}
|
||||
|
||||
public function getDatatable(Request $request)
|
||||
{
|
||||
return Sections::getTables($request->all());
|
||||
return Categories::getDatatable($request->all());
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -35,10 +35,10 @@ class SectionController extends Controller
|
||||
* @param \App\Customer $customer
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function show(Customer $customer)
|
||||
public function show($id)
|
||||
{
|
||||
$data = Sections::get($id);
|
||||
return view('Shop.Admin.Sections.view', $data);
|
||||
$data = Categories::get($id);
|
||||
return view('Shop.Admin.Categories.view', $data);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user