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

Add exports & fix on edition

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2020-08-03 23:09:26 +02:00
parent 1e685cfefb
commit b7d03fc5c4
28 changed files with 190 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/DataTables/Botanic/FamiliesDataTable.php
View File

@@ -8,7 +8,7 @@ use App\Models\Botanic\Family;
class FamiliesDataTable extends DataTable
{
public $model_name = 'Families';
public $model_name = 'families';
public function query(Family $model)
{

2
app/DataTables/Botanic/GenresDataTable.php
View File

@@ -8,7 +8,7 @@ use App\Models\Botanic\Genre;
class GenresDataTable extends DataTable
{
public $model_name = 'Genres';
public $model_name = 'genres';
public function query(Genre $model)
{

2
app/DataTables/Botanic/SpeciesDataTable.php
View File

@@ -8,7 +8,7 @@ use App\Models\Botanic\Specie;
class SpeciesDataTable extends DataTable
{
public $model_name = 'Species';
public $model_name = 'species';
public function query(Specie $model)
{

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

@@ -8,7 +8,7 @@ use App\Models\Botanic\Variety;
class VarietiesDataTable extends DataTable
{
public $model_name = 'Varieties';
public $model_name = 'varieties';
public function query(Variety $model)
{

5
app/DataTables/Shop/CustomersDataTable.php
View File

@@ -18,7 +18,10 @@ class CustomersDataTable extends DataTable
protected function getColumns()
{
return [
Column::make('name'),
Column::make('name')->title('Nom'),
Column::make('address')->title('Adresse'),
Column::make('zipcode')->title('Code postal'),
Column::make('city')->title('Ville'),
self::makeColumnButtons(),
];
}

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

@@ -18,7 +18,9 @@ class InvoicesDataTable extends DataTable
protected function getColumns()
{
return [
Column::make('name'),
Column::make('status.name'),
Column::make('customer.name'),
Column::make('total'),
self::makeColumnButtons(),
];
}

6
app/Http/Controllers/Botanic/Admin/FamilyController.php
View File

@@ -49,4 +49,10 @@ class FamilyController extends Controller
{
return Families::destroy($id);
}
public function exportExcel()
{
return Families::exportExcel();
}
}

6
app/Http/Controllers/Botanic/Admin/GenreController.php
View File

@@ -49,4 +49,10 @@ class GenreController extends Controller
{
return Genres::destroy($id);
}
public function exportExcel()
{
return Genres::exportExcel();
}
}

4
app/Http/Controllers/Botanic/Admin/SpecieController.php
View File

@@ -50,4 +50,8 @@ class SpecieController extends Controller
return Species::destroy($id);
}
public function exportExcel()
{
return Species::exportExcel();
}
}

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

@@ -74,4 +74,8 @@ class VarietyController extends Controller
return Varieties::deleteImage($id, $index);
}
public function exportExcel()
{
return Varieties::exportExcel();
}
}

7
app/Repositories/Botanic/Families.php
View File

@@ -7,8 +7,10 @@ use Illuminate\Support\Facades\DB;
use Illuminate\Support\Str;
use Yajra\DataTables\DataTables;
use Maatwebsite\Excel\Facades\Excel;
use App\Models\Botanic\Family;
use App\Exports\Botanic\FamiliesExport;
class Families
{
@@ -56,4 +58,9 @@ class Families
return Family::destroy($id);
}
public static function exportExcel()
{
return Excel::download(new FamiliesExport, 'families.xlsx');
}
}

6
app/Repositories/Botanic/Genres.php
View File

@@ -7,8 +7,10 @@ use Illuminate\Support\Facades\DB;
use Illuminate\Support\Str;
use Yajra\DataTables\DataTables;
use Maatwebsite\Excel\Facades\Excel;
use App\Models\Botanic\Genre;
use App\Exports\Botanic\GenresExport;
class Genres
{
@@ -56,4 +58,8 @@ class Genres
return Genre::destroy($id);
}
public static function exportExcel()
{
return Excel::download(new GenresExport, 'genres.xlsx');
}
}

6
app/Repositories/Botanic/Species.php
View File

@@ -7,8 +7,10 @@ use Illuminate\Support\Facades\DB;
use Illuminate\Support\Str;
use Yajra\DataTables\DataTables;
use Maatwebsite\Excel\Facades\Excel;
use App\Models\Botanic\Specie;
use App\Exports\Botanic\SpeciesExport;
class Species
{
@@ -56,4 +58,8 @@ class Species
return Specie::destroy($id);
}
public static function exportExcel()
{
return Excel::download(new SpeciesExport, 'species.xlsx');
}
}

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

@@ -7,133 +7,140 @@ use Illuminate\Support\Facades\DB;
use Illuminate\Support\Str;
use Yajra\DataTables\DataTables;
use Maatwebsite\Excel\Facades\Excel;
use App\Models\Botanic\Variety;
use App\Exports\Botanic\VarietiesExport;
class Varieties
{
public static function getDatatable()
{
$model = Variety::with('specie');
return Datatables::of($model)->make(true);
}
public static function getDatatable()
{
$model = Variety::with('specie');
return Datatables::of($model)->make(true);
}
public static function getOptions()
{
return Variety::orderBy('name')->get()->pluck('name','id')->toArray();
}
public static function getOptions()
{
return Variety::orderBy('name')->get()->pluck('name','id')->toArray();
}
public static function getOptionsWithSpecie()
{
$varieties = Variety::with('specie')->get();
$data = [];
foreach ($varieties as $variety)
{
$data[] = ['id' => $variety->id, 'text' => (isset($variety->specie->name) ? $variety->specie->name . ' ' : '') . $variety->name];
}
return collect($data)->sortBy('text')->values()->all();
}
public static function getOptionsWithSpecie()
{
$varieties = Variety::with('specie')->get();
$data = [];
foreach ($varieties as $variety)
{
$data[] = ['id' => $variety->id, 'text' => (isset($variety->specie->name) ? $variety->specie->name . ' ' : '') . $variety->name];
}
return collect($data)->sortBy('text')->values()->all();
}
public static function getAll()
{
return Variety::orderBy('name','asc')->get();
}
public static function getAll()
{
return Variety::orderBy('name','asc')->get();
}
public static function get($id)
{
return Variety::find($id);
}
public static function get($id)
{
return Variety::find($id);
}
public static function getFull($id)
{
$variety = self::get($id);
$data = $variety->toArray();
$data['tags'] = self::getTagsByVariety($variety);
return $data;
}
public static function getFull($id)
{
$variety = self::get($id);
$data = $variety->toArray();
$data['tags'] = self::getTagsByVariety($variety);
return $data;
}
public static function getTagsByVariety($variety)
{
return $variety->tags->pluck('id')->toArray();
}
public static function getTagsByVariety($variety)
{
return $variety->tags->pluck('id')->toArray();
}
public static function storeFull($data)
{
$images = isset($data['images']) ? $data['images'] : false;
$tags = isset($data['tags']) ? $data['tags'] : false;
unset($data['images']);
unset($data['tags']);
$variety = self::store($data);
self::storeImages($variety, $images);
self::storeTags($variety, $tags);
return $variety;
}
public static function storeFull($data)
{
$images = isset($data['images']) ? $data['images'] : false;
$tags = isset($data['tags']) ? $data['tags'] : false;
unset($data['images']);
unset($data['tags']);
$variety = self::store($data);
self::storeImages($variety, $images);
self::storeTags($variety, $tags);
return $variety;
}
public static function store($data)
{
return isset($data['id']) ? self::update($data) : self::create($data);
}
public static function store($data)
{
return isset($data['id']) ? self::update($data) : self::create($data);
}
public static function create($data)
{
return Variety::create($data);
}
public static function create($data)
{
return Variety::create($data);
}
public static function update($data, $id = false)
{
$id = $id ? $id : $data['id'];
$variety = Variety::find($id);
$ret = $variety->update($data);
return $variety;
}
public static function update($data, $id = false)
{
$id = $id ? $id : $data['id'];
$variety = Variety::find($id);
$ret = $variety->update($data);
return $variety;
}
public static function destroy($id)
{
return Variety::destroy($id);
}
public static function destroy($id)
{
return Variety::destroy($id);
}
public static function storeTags($variety, $tags)
{
if ($tags) {
$tags = collect($tags)->transform(function ($item, $key) {
return (int) $item;
})->toArray();
return $variety->syncTags($tags, true);
} else return false;
}
public static function storeTags($variety, $tags)
{
if ($tags) {
$tags = collect($tags)->transform(function ($item, $key) {
return (int) $item;
})->toArray();
return $variety->syncTags($tags, true);
} else return false;
}
public static function storeImages($variety, $files)
{
if ($files) {
foreach ($files as $file) {
$variety->addMedia($file)->withResponsiveImages()->toMediaCollection('images');
}
}
}
public static function storeImages($variety, $files)
{
if ($files) {
foreach ($files as $file) {
$variety->addMedia($file)->withResponsiveImages()->toMediaCollection('images');
}
}
}
public static function getImages($id)
{
$variety = self::get($id);
if ($variety) {
$variety->getMedia();
foreach ($variety->media as $key => $media) {
$variety->media[$key]['url'] = $media->getUrl();
}
return $variety->media;
} else {
return false;
}
}
public static function getImages($id)
{
$variety = self::get($id);
if ($variety) {
$variety->getMedia();
foreach ($variety->media as $key => $media) {
$variety->media[$key]['url'] = $media->getUrl();
}
return $variety->media;
} else {
return false;
}
}
public static function deleteImage($id, $index)
{
$variety = self::get($id);
$variety->getMedia();
$ret = $variety->media[$index]->delete();
return "1";
}
public static function deleteImage($id, $index)
{
$variety = self::get($id);
$variety->getMedia();
$ret = $variety->media[$index]->delete();
return "1";
}
public static function exportExcel()
{
return Excel::download(new VarietiesExport, 'varieties.xlsx');
}
}

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

@@ -64,8 +64,10 @@ class ArticleAttributes
public static function update($data, $id = false)
{
$id = isset($data['id']) ? $id : $data['id'];
return ArticleAttribute::find($id)->update($data);
$id = isset($data['id']) ? $data['id'] : $id;
$item = ArticleAttribute::find($id);
$item->update($data);
return $item;
}
public static function destroy($id)

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

@@ -39,11 +39,15 @@ class ArticlePrices
return ArticlePrice::find($id);
}
public static function storePrices($article_attribute_id, $prices)
public static function storePrices($article_id, $prices)
{
if ($prices) {
foreach ($prices as $key => $price) {
$prices[$key]['article_attribute_id'] = $article_attribute_id;
$price['article_attribute']['article_attribute_value_id'] = $price['attribute']['attribute_value_id'];
$prices[$key]['article_attribute_id'] = ArticleAttributes::storeAttribute($article_id, $price['article_attribute']);
unset($prices[$key]['article_attribute']);
unset($prices[$key]['attribute']);
self::store($prices[$key]);
}
} else {

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

@@ -87,7 +87,7 @@ class Articles
self::storeCategories($article, $categories);
self::storeTags($article, $tags);
self::storePrices($article, $prices);
return $article;
return $article_id;
}
public static function store($data)