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

Change tag routines, articles saving is ok

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2020-06-14 23:30:33 +02:00
parent 927e68223b
commit abc1510284
35 changed files with 703 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/DataTables/Shop/TagsDataTable.php
View File

@@ -12,7 +12,7 @@ class TagsDataTable extends DataTable
public function query(Tag $model)
{
$model = $model::with('group')->select(['tagging_tags.*']);
$model = $model::with('group')->select(['tags.*']);
return self::buildQuery($model);
}
@@ -20,7 +20,7 @@ class TagsDataTable extends DataTable
{
return [
Column::make('group.name')->title('Groupe'),
Column::make('order')->title('Ordre'),
Column::make('sort_order')->title('Ordre'),
Column::make('name')->title('Nom'),
self::makeColumnButtons(),
];

10
app/Http/Controllers/Botanic/Admin/VarietyController.php
View File

@@ -60,6 +60,11 @@ class VarietyController extends Controller
return view('Botanic.Admin.Varieties.edit', $data);
}
public function destroy($id)
{
return Varieties::destroy($id);
}
public function getImages(Request $request, $id = false)
{
$id = $id ? $id : $request->input('id');
@@ -67,11 +72,6 @@ class VarietyController extends Controller
return view('components.uploader.mini-gallery-items', $data);
}
public function destroy($id)
{
return Varieties::destroy($id);
}
public function deleteImage(Request $request)
{
$id = $request->input('id');

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

@@ -6,10 +6,6 @@ use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\Articles;
use App\Repositories\Shop\ArticleAttributeFamilies;
use App\Repositories\Shop\ArticleFamilies;
use App\Repositories\Shop\Categories;
use App\Repositories\Shop\TagGroups;
use App\DataTables\Shop\ArticlesDataTable;
class ArticleController extends Controller
@@ -26,19 +22,26 @@ class ArticleController extends Controller
public function create()
{
$data = [];
$data['categories'] = Categories::getOptions();
$data['families'] = ArticleFamilies::getOptions();
$data['attribute_families'] = ArticleAttributeFamilies::getOptions();
$data['tags_list'] = TagGroups::getTreeTags();
// $data['models'] = ['App\Models\Botanic\Specie' => 'Espèces', 'App\Models\Botanic\Variety' => 'Variétés'];
$data['models'] = ['App\Models\Botanic\Variety' => 'Variétés'];
$data = $this->getMeta();
return view('Shop.Admin.Articles.create', $data);
}
public function store(Request $request)
{
$ret = Articles::store($request->all());
$data = $request->all();
$images = isset($data['images']) ? $data['images'] : false;
$categories = isset($data['categories']) ? $data['categories'] : false;
$tags = isset($data['tags']) ? $data['tags'] : false;
$prices = isset($data['prices']) ? $data['prices'] : false;
unset($data['images']);
unset($data['categories']);
unset($data['tags']);
unset($data['prices']);
$article = Articles::store($data);
Articles::storeImages($article, $images);
Articles::storeCategories($article, $categories);
Articles::storeTags($article, $categories);
Articles::storePrices($article, $prices);
return redirect()->route('Shop.Admin.Articles.index');
}
@@ -50,12 +53,7 @@ class ArticleController extends Controller
public function edit($id)
{
$data = Articles::get($id);
$data['categories'] = Articles::getOptions();
$data['families'] = ArticleFamilies::getOptions();
$data['attribute_families'] = ArticleAttributeFamilies::getOptions();
$data['tags_list'] = TagGroups::getTreeTags();
$data['models'] = ['App\Models\Botanic\Specie' => 'Espèces', 'App\Models\Botanic\Variety' => 'Variétés'];
$data = Articles::getFull($id);
return view('Shop.Admin.Articles.edit', $data);
}
@@ -69,6 +67,18 @@ class ArticleController extends Controller
return Articles::destroy($id);
}
public function getMeta($data = [])
{
return Articles::getMeta($data);
}
public function getImages(Request $request, $id = false)
{
$id = $id ? $id : $request->input('id');
$data['images'] = Articles::getImages($id);
return view('components.uploader.mini-gallery-items', $data);
}
public function deleteImage(Request $request)
{
$id = $request->input('id');

60
app/Http/Controllers/Shop/Admin/TagController.php Normal file
View File

@@ -0,0 +1,60 @@
<?php
namespace App\Http\Controllers\Shop\Admin;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\Tags;
use App\Repositories\Shop\TagGroups;
use App\DataTables\Shop\TagsDataTable;
class TagController extends Controller
{
public function index(TagsDataTable $dataTable)
{
return $dataTable->render('Shop.Admin.Tags.list');
}
public function getDatatable(Request $request)
{
return Tags::getTables($request->all());
}
public function create()
{
$data = [];
$data['tag_groups'] = TagGroups::getOptions();
return view('Shop.Admin.Tags.create', $data);
}
public function store(Request $request)
{
$ret = Tags::store($request->all());
return redirect()->route('Shop.Admin.Tags.index');
}
public function show($id)
{
$data = Tags::get($id);
return view('Shop.Admin.Tags.view', $data);
}
public function edit($id)
{
$data = Tags::get($id);
$data['tag_groups'] = TagGroups::getOptions();
return view('Shop.Admin.Tags.edit', $data);
}
public function update(Request $request)
{
//
}
public function destroy($id)
{
return Tags::destroy($id);
}
}

58
app/Http/Controllers/Shop/Admin/TaxController.php Normal file
View File

@@ -0,0 +1,58 @@
<?php
namespace App\Http\Controllers\Shop\Admin;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\Taxes;
class TaxController extends Controller
{
public function index(TaxesDataTable $dataTable)
{
return $dataTable->render('Shop.Admin.Taxes.list');
}
public function getDatatable(Request $request)
{
return Taxes::getTables($request->all());
}
public function create()
{
$data = [];
$data['groups'] = TagGroups::getOptions();
return view('Shop.Admin.Taxes.create', $data);
}
public function store(Request $request)
{
$ret = Taxes::store($request->all());
return redirect()->route('Shop.Admin.Taxes.index');
}
public function show($id)
{
$data = Taxes::get($id);
return view('Shop.Admin.Taxes.view', $data);
}
public function edit($id)
{
$data = Taxes::get($id);
$data['groups'] = TagGroups::getOptions();
return view('Shop.Admin.Taxes.edit', $data);
}
public function update(Request $request)
{
//
}
public function destroy($id)
{
return Taxes::destroy($id);
}
}

1
app/Models/Botanic/Variety.php
View File

@@ -5,6 +5,7 @@ namespace App\Models\Botanic;
use Illuminate\Database\Eloquent\Model;
use Spatie\MediaLibrary\HasMedia\HasMedia;
use Spatie\MediaLibrary\HasMedia\HasMediaTrait;
use Rinvex\Tags\Traits\Taggable;
class Variety extends Model implements HasMedia
{

9
app/Models/Shop/Article.php
View File

@@ -6,9 +6,9 @@ use Illuminate\Database\Eloquent\Model;
use Spatie\MediaLibrary\HasMedia\HasMedia;
use Spatie\MediaLibrary\HasMedia\HasMediaTrait;
use Rinvex\Categories\Traits\Categorizable;
use Conner\Tagging\Taggable;
use Rinvex\Tags\Traits\Taggable;
class Article extends Model
class Article extends Model implements HasMedia
{
use Categorizable;
use Taggable;
@@ -37,11 +37,6 @@ class Article extends Model
return $this->hasManyThrough('App\Models\Shop\ArticleAttribute','App\Models\Shop\ArticlePrice');
}
public function Categories()
{
return $this->hasMany('App\Models\Shop\ArticleCategory');
}
public function InvoiceItems()
{
return $this->hasMany('App\Models\Shop\InvoiceItem');

2
app/Models/Shop/Category.php
View File

@@ -5,7 +5,7 @@ namespace App\Models\Shop;
use Illuminate\Database\Eloquent\Model;
use Rinvex\Categories\Traits\Categorizable;
use Conner\Tagging\Taggable;
// use Conner\Tagging\Taggable;
class Category extends Model
{

11
app/Models/Shop/Tag.php
View File

@@ -7,11 +7,20 @@ use Illuminate\Database\Eloquent\Model;
class Tag extends Model
{
protected $guarded = ['id'];
protected $table = 'tagging_tags';
public function group()
{
return $this->hasOne('App\Models\Shop\TagGroup','id','tag_group_id');
}
public function scopeByGroup($query, $id)
{
return $query->where('tag_group_id', $id);
}
public function getNameAttribute($value)
{
return json_decode($value)->fr;
}
}

2
app/Models/Shop/TagGroup.php
View File

@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Model;
class TagGroup extends Model
{
protected $guarded = ['id'];
protected $table = 'tagging_tag_groups';
protected $table = 'tag_groups';
public function tags()
{

17
app/Models/Shop/Tax.php Normal file
View File

@@ -0,0 +1,17 @@
<?php
namespace App\Models\Shop;
use Illuminate\Database\Eloquent\Model;
class Tax extends Model
{
protected $guarded = ['id'];
protected $table = 'shop_taxes';
public function price()
{
return $this->hasMany('App\Models\Shop\ArticlePrice','id','tax_id');
}
}

12
app/Repositories/Botanic/Varieties.php
View File

@@ -79,11 +79,15 @@ class Varieties
public static function getImages($id)
{
$variety = self::get($id);
$variety->getMedia();
foreach ($variety->media as $key => $media) {
$variety->media[$key]['url'] = $media->getUrl();
if ($variety) {
$variety->getMedia();
foreach ($variety->media as $key => $media) {
$variety->media[$key]['url'] = $media->getUrl();
}
return $variety->media;
} else {
return false;
}
return $variety->media;
}
public static function deleteImage($id, $index)

10
app/Repositories/Shop/ArticleAttributes.php
View File

@@ -25,6 +25,16 @@ class ArticleAttributes
return ArticleAttribute::find($id);
}
public static function storeAttributes($article_price_id, $attributes)
{
foreach ($attributes as $key => $attribute)
{
$attributes[$key]['article_price_id'] = $article_price_id;
unset($attributes[$key]['attribute_family_id']);
self::store($attributes[$key]);
}
}
public static function store($data)
{
$id = isset($data['id']) ? $data['id'] : false;

85
app/Repositories/Shop/ArticlePrices.php
View File

@@ -13,42 +13,65 @@ use App\Models\Shop\ArticlePrice;
class ArticlePrices
{
public static function getDatatable()
{
$model = ArticlePrice::orderBy('name');
return Datatables::of($model)->make(true);
}
public static function getDatatable()
{
$model = ArticlePrice::orderBy('name');
return Datatables::of($model)->make(true);
}
public static function getAll()
{
return ArticlePrice::orderBy('name','asc')->get();
}
public static function getAll()
{
return ArticlePrice::orderBy('name','asc')->get();
}
public static function get($id)
{
return ArticlePrice::find($id);
}
public static function get($id)
{
return ArticlePrice::find($id);
}
public static function store($data)
{
$id = isset($data['id']) ? $data['id'] : false;
$item = $id ? self::update($data) : self::create($data);
return $item->id;
}
public static function storePrices($article_id, $prices)
{
if ($prices) {
foreach ($prices as $$key => $price) {
$prices[$key]['article_id'] = $article_id;
self::store($prices[$key]);
}
} else {
return false;
}
}
public static function create($data)
{
return ArticlePrice::create($data);
}
public static function storeAttributes($article_price_id,$attributes)
{
return ArticleAttributes::storeAttributes($article_price_id, $attributes);
}
public static function update($data)
{
return ArticlePrice::find($id)->update($data);
}
public static function store($data)
{
$attributes = isset($data['attributes']) ? $data['attributes'] : false;
unset($data['attributes']);
$id = isset($data['id']) ? $data['id'] : false;
$price = $id ? self::update($data) : self::create($data);
$ret = $attributes ? self::storeAttributes($price->id, $attributes) : false;
return $price->id;
}
public static function destroy($id)
{
return ArticlePrice::destroy($id);
}
public static function create($data)
{
return ArticlePrice::create($data);
}
public static function update($data)
{
return ArticlePrice::find($id)->update($data);
}
public static function destroy($id)
{
return ArticlePrice::destroy($id);
}
}

94
app/Repositories/Shop/Articles.php
View File

@@ -24,6 +24,37 @@ class Articles
return Article::orderBy('name','asc')->get();
}
public static function getFull($id)
{
$article = Articles::get($id);
$data = $article->toArray();
$data['categories'] = self::getCategoriesByArticle($article);
$data['tags'] = self::getTagsByArticle($article);
$data = self::getMeta($data);
return $data;
}
public static function getMeta($data = [])
{
$data['categories_options'] = Categories::getOptions();
$data['families_options'] = ArticleFamilies::getOptions();
$data['taxes_options'] = Taxes::getOptions();
$data['attribute_families_options'] = ArticleAttributeFamilies::getOptions();
$data['tags_list'] = TagGroups::getTreeTags();
$data['models_options'] = ['App\Models\Botanic\Specie' => 'Espèces', 'App\Models\Botanic\Variety' => 'Variétés'];
return $data;
}
public static function getCategoriesByArticle($article)
{
return $article->categories->pluck('id')->toArray();
}
public static function getTagsByArticle($article)
{
return $article->tags->pluck('id')->toArray();
}
public static function get($id)
{
return Article::find($id);
@@ -32,8 +63,7 @@ class Articles
public static function store($data)
{
$id = isset($data['id']) ? $data['id'] : false;
$item = $id ? self::update($data) : self::create($data);
return $item->id;
return $id ? self::update($data) : self::create($data);
}
public static function create($data)
@@ -41,9 +71,12 @@ class Articles
return Article::create($data);
}
public static function update($data)
public static function update($data, $id = false)
{
return Article::find($id)->update($data);
$id = $id ? $id : $data['id'];
$article = Article::find($id);
$ret = $article->update($data);
return $article;
}
public static function destroy($id)
@@ -51,14 +84,57 @@ class Articles
return Article::destroy($id);
}
public static function storeCategories($article, $categories)
{
if ($categories)
{
$categories = collect($categories)->transform(function ($item, $key) {
return (int) $item;
})->toArray();
return $article->attachCategories($categories);
} else return false;
}
public static function storeTags($article, $tags)
{
if ($tags)
{
return $article->attachTags($tags);
}
}
public static function storePrices($article, $prices)
{
return ArticlePrices::storePrices($article->id, $prices);
}
public static function storeImages($article, $files)
{
if ($files) {
foreach ($files as $file) {
self::storeImage($article, $file);
}
}
}
public static function storeImage($article, $file)
{
return $article->addMedia($file)->withResponsiveImages()->toMediaCollection('images');
}
public static function getImages($id)
{
$variety = self::get($id);
$variety->getMedia();
foreach ($variety->media as $key => $media) {
$variety->media[$key]['url'] = $media->getUrl();
$article = self::get($id);
if ($article)
{
$article->getMedia();
foreach ($article->media as $key => $media) {
$article->media[$key]['url'] = $media->getUrl();
}
return $article->media;
} else {
return false;
}
return $variety->media;
}

17
app/Repositories/Shop/Tags.php
View File

@@ -43,11 +43,19 @@ class Tags
public static function create($data)
{
return Tag::create($data);
$tag = app('rinvex.tags.tag')->create(['name' => ['fr' => $data['name']]]);
$tag2 = Tag::find($tag->id);
$tag2->tag_group_id = $data['tag_group_id'];
$tag2->sort_order = self::getNewOrder($data['tag_group_id']);
$tag2->save();
// return app('rinvex.tags.tag')->createByName($data['name']);
// return Tag::create($data);
return $tag;
}
public static function update($data)
public static function update($data, $id = false)
{
$id = $id ? $id : $data['id'];
return Tag::find($id)->update($data);
}
@@ -56,4 +64,9 @@ class Tags
return Tag::destroy($id);
}
public static function getNewOrder($tag_group_id)
{
$tag = Tag::byGroup($tag_group_id)->orderBy('sort_order', 'desc')->first();
return $tag ? (int) $tag->sort_order + 1 : 1;
}
}

58
app/Repositories/Shop/Taxes.php Normal file
View File

@@ -0,0 +1,58 @@
<?php
namespace App\Repositories\Shop;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Str;
use Yajra\DataTables\DataTables;
use App\Models\Shop\Tax;
class Taxes
{
public static function getDatatable()
{
return Datatables::of($model)->make(true);
}
public static function getOptions()
{
return Tax::orderBy('value','asc')->get()->pluck('value','id')->toArray();
}
public static function getAll()
{
return Tax::orderBy('value','asc')->get();
}
public static function get($id)
{
return Tax::find($id);
}
public static function store($data)
{
$id = isset($data['id']) ? $data['id'] : false;
$item = $id ? self::update($data) : self::create($data);
return $item->id;
}
public static function create($data)
{
return Tax::create($data);
}
public static function update($data)
{
return Tax::find($id)->update($data);
}
public static function destroy($id)
{
return Tax::destroy($id);
}
}