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

Fixes after reading excel files and discuss with eric

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2021-03-26 15:40:53 +01:00
parent 37ffaa938b
commit 22fa3d3246
22 changed files with 456 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/DataTables/Botanic/VarietiesDataTable.php
View File

@@ -13,16 +13,16 @@ class VarietiesDataTable extends DataTable
public function query(Variety $model)
{
// $model = $model::with('specie')->withCount('Articles')->select('botanic_varieties.*');
$model = $model::joinRelations('Specie')->select('botanic_varieties.*','botanic_species.name as specie_name')->withCount('Articles');
$model = $model::joinRelations('Specie')->select('botanic_varieties.*','botanic_species.name as specie_name')->with('Specie')->withCount('Articles');
return self::buildQuery($model);
}
protected function getColumns()
{
return [
Column::make('specie_name')->title('Espèce'),
Column::make('Specie.name')->data('specie_name')->title('Espèce'),
Column::make('name')->title('Nom'),
Column::make('articles_count')->title('Nb articles')->class('text-right'),
Column::make('articles_count')->title('Nb articles')->class('text-right')->searchable(false),
self::makeColumnButtons(),
];
}

2
app/DataTables/Shop/PriceGenericsDataTable.php
View File

@@ -23,7 +23,7 @@ class PriceGenericsDataTable extends DataTable
Column::make('name')->title('Nom'),
Column::make('price_by_unit.price')->title('Prix HT')->class('text-right'),
Column::make('price_by_unit.price_taxed')->title('Prix TTC')->class('text-right'),
Column::make('prices_count')->title('Nb articles')->class('text-right'),
Column::make('prices_count')->title('Nb tarifs')->class('text-right'),
self::makeColumnButtons(),
];
}

64
app/Http/Controllers/Shop/Admin/PackageController.php Normal file
View File

@@ -0,0 +1,64 @@
<?php
namespace App\Http\Controllers\Shop\Admin;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\ArticleFamilies;
use App\Repositories\Shop\Packages;
use App\DataTables\Shop\PackagesDataTable;
class PackageController extends Controller
{
public function index(PackagesDataTable $dataTable)
{
$data['families'] = ArticleFamilies::getOptions();
return $dataTable->render('Shop.Admin.Packages.list', $data);
}
public function getDatatable(Request $request)
{
return Packages::getTables($request->all());
}
public function getOptionsByFamily(Request $request)
{
$id = $request->input('family_id');
return response()->json(Packages::getSelectByFamily($id));
}
public function create()
{
return view('Shop.Admin.Packages.create');
}
public function store(Request $request)
{
$ret = Packages::store($request->all());
return redirect()->route('Shop.Admin.Packages.index');
}
public function show($id)
{
$data = Packages::get($id);
return view('Shop.Admin.Packages.view', $data);
}
public function edit($id)
{
$data = Packages::get($id);
return view('Shop.Admin.Packages.edit', $data);
}
public function update(Request $request)
{
//
}
public function destroy($id)
{
return Packages::destroy($id);
}
}

6
app/Http/Controllers/Shop/Admin/PriceGenericController.php
View File

@@ -9,6 +9,7 @@ use App\Models\Shop\PriceGeneric;
use App\Repositories\Shop\PriceGenerics;
use App\Repositories\Shop\PriceGenericCategories;
use App\Repositories\Shop\Taxes;
use App\Repositories\Shop\Packages;
use App\Repositories\Shop\Unities;
use App\DataTables\Shop\PriceGenericsDataTable;
@@ -34,8 +35,9 @@ class PriceGenericController extends Controller
public function edit($id)
{
$data['generic'] = PriceGenerics::get($id)->toArray();
$data['unities'] = Unities::getOptions();
$data['generic'] = PriceGenerics::getFull($id)->toArray();
$data['packages'] = Packages::getSelectByFamily($data['generic']['category']['article_family_id']);
$data['unities'] = ($data['packages']['id'] ?? false) ? Unities::getSelectByPackage($data['packages']['id']) : [];
$data['taxes'] = Taxes::getOptions();
$data['categories'] = PriceGenericCategories::getOptions();
return view('Shop.Admin.PriceGenerics.edit', $data);

17
app/Http/Controllers/Shop/Admin/UnityController.php
View File

@@ -9,7 +9,7 @@ use App\Repositories\Shop\ArticleFamilies;
use App\Repositories\Shop\Unities;
use App\DataTables\Shop\UnitiesDataTable;
class UnityValueController extends Controller
class UnityController extends Controller
{
public function index(UnitiesDataTable $dataTable)
{
@@ -22,10 +22,10 @@ class UnityValueController extends Controller
return Unities::getTables($request->all());
}
public function getOptionsByFamily(Request $request)
public function getOptionsByPackage(Request $request)
{
$id = $request->input('family_id');
return response()->json(Unities::getSelectByFamily($id));
$id = $request->input('package_id');
return response()->json(Unities::getSelectByPackage($id));
}
public function create()
@@ -51,14 +51,13 @@ class UnityValueController extends Controller
return view('Shop.Admin.Unities.edit', $data);
}
public function update(Request $request)
{
//
}
public function destroy($id)
{
return Unities::destroy($id);
}
public function update($id) {
}
}

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

@@ -24,6 +24,6 @@ class Variety extends Model implements HasMedia
public function Articles()
{
return $this->hasMany('App\Models\Shop\Article','model_id','id');
return $this->morphMany('App\Models\Shop\Article','product');
}
}

21
app/Models/Shop/Package.php Normal file
View File

@@ -0,0 +1,21 @@
<?php
namespace App\Models\Shop;
use Illuminate\Database\Eloquent\Model;
class Package extends Model
{
protected $guarded = ['id'];
protected $table = 'shop_packages';
public function article_family()
{
return $this->belongsTo('App\Models\Shop\ArticleFamily');
}
public function scopeByFamily($query, $id)
{
return $query->where('article_family_id', $id);
}
}

5
app/Models/Shop/PriceGenericCategory.php
View File

@@ -10,6 +10,11 @@ class PriceGenericCategory extends Model
protected $guarded = ['id'];
protected $table = 'shop_price_generic_categories';
public function article_family()
{
return $this->belongsTo('App\Models\Shop\ArticleFamily');
}
public function price_generics()
{
return $this->hasMany('App\Models\Shop\PriceGeneric','category_id');

8
app/Models/Shop/Unity.php
View File

@@ -9,13 +9,13 @@ class Unity extends Model
protected $guarded = ['id'];
protected $table = 'shop_unities';
public function article_family()
public function package()
{
return $this->belongsTo('App\Models\Shop\ArticleFamily');
return $this->belongsTo('App\Models\Shop\Package');
}
public function scopeByFamily($query, $id)
public function scopeByPackage($query, $id)
{
return $query->where('article_family_id');
return $query->where('package_id', $id);
}
}

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

@@ -13,183 +13,184 @@ use App\Models\Shop\Article;
class Articles
{
public static function getDatatable()
{
$model = Article::orderBy('name');
return Datatables::of($model)->make(true);
}
public static function getDatatable()
{
$model = Article::orderBy('name');
return Datatables::of($model)->make(true);
}
public static function getAll()
{
return Article::orderBy('name','asc')->get();
}
public static function getAll()
{
return Article::orderBy('name','asc')->get();
}
public static function getFull($id)
{
$article = self::get($id);
$data = $article->toArray();
$data['categories'] = self::getCategoriesByArticle($article);
$data['tags'] = self::getTagsByArticle($article);
$data['prices'] = self::getPricesByArticle($article);
self::getMeta($data);
return $data;
}
public static function getFull($id)
{
$article = self::get($id);
$data = $article->toArray();
$data['categories'] = self::getCategoriesByArticle($article);
$data['tags'] = self::getTagsByArticle($article);
$data['prices'] = self::getPricesByArticle($article);
self::getMeta($data);
return $data;
}
public static function getMeta(&$data = [])
{
$data['categories_options'] = Categories::getOptions();
$data['price_generics'] = PriceGenericCategories::getOptionsWithChildrens();
$data['families_options'] = ArticleFamilies::getOptions();
$data['taxes_options'] = Taxes::getOptions();
$data['unities'] = Unities::getSelectByFamily($data['article_family_id']);
$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 getMeta(&$data = [])
{
$data['categories_options'] = Categories::getOptions();
$data['price_generics'] = PriceGenericCategories::getOptionsWithChildrens();
$data['families_options'] = ArticleFamilies::getOptions();
$data['taxes_options'] = Taxes::getOptions();
$data['packages'] = Packages::getSelectByFamily($data['article_family_id']);
$data['unities'] = ($data['packages']['id'] ?? false) ? Unities::getSelectByPackage($data['packages']['id']) : [];
$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 getByCategory($category_id)
{
// TODO add category
return Article::with(['prices','product','image'])->get();
}
public static function getByCategory($category_id)
{
// TODO add category
return Article::with(['prices','product','image'])->get();
}
public static function getCategoriesByArticle($article)
{
return $article->categories->pluck('id')->toArray();
}
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 getTagsByArticle($article)
{
return $article->tags->pluck('id')->toArray();
}
public static function getPricesByArticle($article)
{
return Prices::getByArticle($article->id);
}
public static function getPricesByArticle($article)
{
return Prices::getByArticle($article->id);
}
public static function get($id)
{
return Article::find($id);
}
public static function get($id)
{
return Article::find($id);
}
public static function storeFull($data)
{
$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 = self::store($data);
self::storeImages($article, $images);
self::storeCategories($article, $categories);
self::storeTags($article, $tags);
self::storePrices($article, $prices);
return $article->id;
}
public static function storeFull($data)
{
$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 = self::store($data);
self::storeImages($article, $images);
self::storeCategories($article, $categories);
self::storeTags($article, $tags);
self::storePrices($article, $prices);
return $article->id;
}
public static function store($data)
{
$id = isset($data['id']) ? $data['id'] : false;
return $id ? self::update($data) : self::create($data);
}
public static function store($data)
{
$id = isset($data['id']) ? $data['id'] : false;
return $id ? self::update($data) : self::create($data);
}
public static function create($data)
{
return Article::create($data);
}
public static function create($data)
{
return Article::create($data);
}
public static function update($data, $id = false)
{
$id = $id ? $id : $data['id'];
$article = Article::find($id);
$ret = $article->update($data);
return $article;
}
public static function update($data, $id = false)
{
$id = $id ? $id : $data['id'];
$article = Article::find($id);
$ret = $article->update($data);
return $article;
}
public static function destroy($id)
{
return Article::destroy($id);
}
public static function destroy($id)
{
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->syncCategories($categories, true);
} else {
return false;
}
}
public static function storeCategories($article, $categories)
{
if ($categories) {
$categories = collect($categories)->transform(function ($item, $key) {
return (int) $item;
})->toArray();
return $article->syncCategories($categories, true);
} else {
return false;
}
}
public static function storeTags($article, $tags)
{
if ($tags) {
$tags = collect($tags)->transform(function ($item, $key) {
return (int) $item;
})->toArray();
return $article->syncTags($tags, true);
} else return false;
}
public static function storeTags($article, $tags)
{
if ($tags) {
$tags = collect($tags)->transform(function ($item, $key) {
return (int) $item;
})->toArray();
return $article->syncTags($tags, true);
} else return false;
}
public static function storePrices($article, $prices)
{
return ArticlePrices::storePrices($article->id, $prices);
}
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 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 storeImage($article, $file)
{
return $article->addMedia($file)->withResponsiveImages()->toMediaCollection('images');
}
public static function getImages($id)
{
$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;
}
}
public static function getImages($id)
{
$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;
}
}
public static function getThumbSrc($image)
{
$id = $image['id'];
$images = json_decode($image['responsive_images'], true);
$urls = $images['medialibrary_original']['urls'];
public static function getThumbSrc($image)
{
$id = $image['id'];
$images = json_decode($image['responsive_images'], true);
$urls = $images['medialibrary_original']['urls'];
$img = $urls[count($urls)-1];
$src = "storage/$id/responsive-images/$img";
return $src;
}
$img = $urls[count($urls)-1];
$src = "storage/$id/responsive-images/$img";
return $src;
}
public static function deleteImage($id, $index)
{
$article = self::get($id);
$article->getMedia();
$ret = $article->media[$index]->delete();
return "1";
}
public static function deleteImage($id, $index)
{
$article = self::get($id);
$article->getMedia();
$ret = $article->media[$index]->delete();
return "1";
}
}

63
app/Repositories/Shop/Packages.php Normal file
View File

@@ -0,0 +1,63 @@
<?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\Package;
class Packages
{
public static function getDatatable()
{
return Datatables::of($model)->make(true);
}
public static function getOptions()
{
return Package::orderBy('value','asc')->pluck('value','id')->toArray();
}
public static function getSelectByFamily($family_id)
{
return Package::orderBy('value','asc')->byFamily($family_id)->pluck('value','id')->toArray();
}
public static function getAll()
{
return Package::orderBy('value','asc')->get();
}
public static function get($id)
{
return Package::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 Package::create($data);
}
public static function update($data)
{
return Package::find($id)->update($data);
}
public static function destroy($id)
{
return Package::destroy($id);
}
}

7
app/Repositories/Shop/PriceGenerics.php
View File

@@ -43,7 +43,12 @@ class PriceGenerics
public static function get($id)
{
return PriceGeneric::with("values")->find($id);
return PriceGeneric::find($id);
}
public static function getFull($id)
{
return PriceGeneric::with(['category','prices'])->find($id);
}
public static function store($data)

4
app/Repositories/Shop/Unities.php
View File

@@ -23,9 +23,9 @@ class Unities
return Unity::orderBy('value','asc')->get()->pluck('value','id')->toArray();
}
public static function getSelectByFamily($family_id)
public static function getSelectByPackage($package_id)
{
$values = Unity::byFamily($family_id)->get();
$values = Unity::byPackage($package_id)->get();
$data = [];
foreach ($values as $value)
{