Add exports & fix on edition

2020-08-03 23:09:26 +02:00
parent 1e685cfefb
commit b7d03fc5c4
28 changed files with 190 additions and 136 deletions
--- a/app/Repositories/Botanic/Families.php
+++ b/app/Repositories/Botanic/Families.php
@@ -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');
+    }
+
 }
--- a/app/Repositories/Botanic/Genres.php
+++ b/app/Repositories/Botanic/Genres.php
@@ -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');
+    }
 }
--- a/app/Repositories/Botanic/Species.php
+++ b/app/Repositories/Botanic/Species.php
@@ -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');
+    }
 }
--- a/app/Repositories/Botanic/Varieties.php
+++ b/app/Repositories/Botanic/Varieties.php
@@ -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');
+	}

 }
--- a/app/Repositories/Shop/ArticleAttributes.php
+++ b/app/Repositories/Shop/ArticleAttributes.php
@@ -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)
--- a/app/Repositories/Shop/ArticlePrices.php
+++ b/app/Repositories/Shop/ArticlePrices.php
@@ -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 {
--- a/app/Repositories/Shop/Articles.php
+++ b/app/Repositories/Shop/Articles.php
@@ -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)