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

Minor fixes, coding standards

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2021-11-01 00:50:10 +01:00
parent e356b3fcda
commit 8aaab4345f
47 changed files with 133 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,7 +51,7 @@ class Families
{
$id = $id ? $id : $data['id'];
$item = self::get($id);
$item->update($data);
$item->update($data);
return $item;
}

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

@@ -12,7 +12,6 @@ use App\Repositories\Core\Tag;
use App\Models\Botanic\Specie;
use App\Exports\Botanic\SpeciesExport;
class Species
{
@@ -62,7 +61,7 @@ class Species
unset($data['images']);
unset($data['tags']);
$specie = self::store($data);
self::storeImages($variety, $images);
self::storeImages($specie, $images);
self::storeTags($specie, $tags);
return $specie;
}

2
app/Repositories/Core/App/ApplicationClients.php
View File

@@ -52,7 +52,7 @@ class ApplicationClients
public static function dissociateApplications($client_id, $applications)
{
$client_name = \App\Repositories\Clients::getName($client_id);
$client_name = Clients::getName($client_id);
foreach ($applications as $key => $application_id) {
self::dissociateApplication($client_id, $application_id);
}

3
app/Repositories/Core/App/ApplicationModules.php
View File

@@ -1,10 +1,9 @@
<?php
namespace App\Repositories\Core\App;
use App\Models\Core\App\ApplicationModule;
use Illuminate\Support\Facades\Route;
class ApplicationModules
{
public static function select_all()

1
app/Repositories/Core/App/ApplicationPages.php
View File

@@ -11,7 +11,6 @@ class ApplicationPages
return $app ? $app->toArray() : null;
}
// récupère toutes les pages actives pour une application
public static function getActiveByApplication($application_id)
{
$app = ApplicationPage::active()->byApplication($application_id)->get();

5
app/Repositories/Core/Arrays.php
View File

@@ -10,11 +10,10 @@ class Arrays
if (is_array($value)) {
$array[$key] = self::changeKeyName($value, $newkey, $oldkey);
} else {
$array[$newkey] = $array[$oldkey];
$array[$newkey] = $array[$oldkey];
}
}
unset($array[$oldkey]);
return $array;
return $array;
}
}

1
app/Repositories/Core/Medias.php
View File

@@ -95,5 +95,4 @@ class Medias
return "/storage/$id/conversions/$filename";
}
}

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

@@ -25,7 +25,7 @@ class Articles
public static function getOptions()
{
return Article::orderBy('name','asc')->pluck('name','id')->toArray();
return Article::orderBy('name', 'asc')->pluck('name', 'id')->toArray();
}
public static function getOptionsWithNature()
@@ -78,14 +78,30 @@ class Articles
$product_type = $article->product_type;
switch ($product_type) {
case 'App\Models\Botanic\Variety':
$data[] = ['name' => 'Espèces', 'description' => Species::getDescription($article->product->specie_id), 'tags' => Species::getTags($article->product->specie_id)];
$data[] = ['name' => 'Variétés', 'description' => $article->product->description, 'tags' => $article->product->tags->toArray()];
$data[] = [
'name' => 'Espèces',
'description' => Species::getDescription($article->product->specie_id),
'tags' => Species::getTags($article->product->specie_id),
];
$data[] = [
'name' => 'Variétés',
'description' => $article->product->description,
'tags' => $article->product->tags->toArray()
];
break;
case 'App\Models\Botanic\Specie':
$data[] = ['name' => 'Espèces', 'description' => $article->product->description, 'tags' => $article->product->tags->toArray()];
$data[] = [
'name' => 'Espèces',
'description' => $article->product->description,
'tags' => $article->product->tags->toArray()
];
break;
case 'App\Models\Shop\Merchandise':
$data[] = ['name' => 'Marchandise', 'description' => $article->product->description, 'tags' => $article->product->tags->toArray()];
$data[] = [
'name' => 'Marchandise',
'description' => $article->product->description,
'tags' => $article->product->tags->toArray(),
];
break;
}
return $data;
@@ -96,16 +112,32 @@ class Articles
switch ($product_type) {
case 'App\Models\Botanic\Variety':
$product = Varieties::get($product_id);
$data[] = ['name' => 'Espèces', 'description' => Species::getDescription($product->specie_id), 'tags' => Species::getTags($product->specie_id)];
$data[] = ['name' => 'Variétés', 'description' => $product->description, 'tags' => $product->tags->toArray()];
$data[] = [
'name' => 'Espèces',
'description' => Species::getDescription($product->specie_id),
'tags' => Species::getTags($product->specie_id),
];
$data[] = [
'name' => 'Variétés',
'description' => $product->description,
'tags' => $product->tags->toArray(),
];
break;
case 'App\Models\Botanic\Specie':
$product = Species::get($product_id);
$data[] = ['name' => 'Espèces', 'description' => $product->description, 'tags' => $product->tags->toArray()];
$data[] = [
'name' => 'Espèces',
'description' => $product->description,
'tags' => $product->tags->toArray(),
];
break;
case 'App\Models\Shop\Merchandise':
$product = Merchandises::get($product_id);
$data[] = ['name' => 'Marchandise', 'description' => $product->description, 'tags' => $product->tags->toArray()];
$data[] = [
'name' => 'Marchandise',
'description' => $product->description,
'tags' => $product->tags->toArray()
];
break;
}
return $data;

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

@@ -77,7 +77,7 @@ class Categories
public static function storeImage($category, $file)
{
return $article->addMedia($file)->withResponsiveImages()->toMediaCollection('images');
return $category->addMedia($file)->withResponsiveImages()->toMediaCollection('images');
}
public static function getImages($id)

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

@@ -38,7 +38,7 @@ class Customers
return Customer::create($data);
}
public static function update($data, $id = false)
public static function update($data, $id = false)
{
$id = isset($data['id']) ? $data['id'] : false;
return Customer::find($id)->update($data);

3
app/Repositories/Shop/Deliveries.php
View File

@@ -33,7 +33,7 @@ class Deliveries
return Delivery::create($data);
}
public static function update($data, $id = false)
public static function update($data, $id = false)
{
$id = $id ? $id : $data['id'];
$delivery = self::get($id);
@@ -50,5 +50,4 @@ class Deliveries
{
return self::update(['active' => $active], $id);
}
}

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

@@ -38,7 +38,7 @@ class Invoices
return Invoice::create($data);
}
public static function update($data, $id = false)
public static function update($data, $id = false)
{
$id = isset($data['id']) ? $data['id'] : false;
return self::get($id)->update($data);

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

@@ -39,7 +39,7 @@ class Offers
return Offer::create($data);
}
public static function update($data, $id = false)
public static function update($data, $id = false)
{
$id = $id ? $id : $data['id'];
$item = self::get($id);

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

@@ -38,7 +38,7 @@ class Orders
return Order::create($data);
}
public static function update($data, $id = false)
public static function update($data, $id = false)
{
$id = $id ? $id : $data['id'];
$item = self::get($id);

9
app/Repositories/Shop/Packages.php
View File

@@ -10,7 +10,7 @@ class Packages
public static function getOptions()
{
return Package::orderBy('value', 'asc')->pluck('value', 'id')->toArray();
}
}
public static function getAll()
{
@@ -30,7 +30,7 @@ class Packages
public static function store($data)
{
$id = isset($data['id']) ? $data['id'] : false;
$item = $id ? self::update($data) : self::create($data);
$item = $id ? self::update($data) : self::create($data);
return $item->id;
}
@@ -39,11 +39,11 @@ class Packages
return Package::create($data);
}
public static function update($data, $id = false)
public static function update($data, $id = false)
{
$id = $id ? $id : $data['id'];
$item = self::get($id);
$item->update($data);
$item->update($data);
return $item;
}
@@ -51,5 +51,4 @@ class Packages
{
return Package::destroy($id);
}
}

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

@@ -54,7 +54,7 @@ class PriceListValues
return PriceListValue::create($data);
}
public static function update($data, $id = false)
public static function update($data, $id = false)
{
$id = $id ? $id : $data['id'];
$item = self::get($id);

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

@@ -28,7 +28,7 @@ class PriceLists
public static function getOptions()
{
return PriceList::pluck('name','id')->toArray();
return PriceList::pluck('name', 'id')->toArray();
}
public static function getAll()
@@ -76,7 +76,7 @@ class PriceLists
return PriceList::create($data);
}
public static function update($data, $id = false)
public static function update($data, $id = false)
{
$id = $id ? $id : $data['id'];
$item = self::get($id);

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

@@ -16,7 +16,7 @@ class Prices
public static function getByArticle($id)
{
$data['prices'] = Price::byArticle($id)->notGeneric()->get()->toArray();
$data['generics'] = Price::byArticle($id)->generic()->with(['generic.prices','generic.category'])->get()->toArray();
$data['generics'] = Price::byArticle($id)->generic()->with(['generic.prices', 'generic.category'])->get()->toArray();
return $data;
}
@@ -48,7 +48,7 @@ class Prices
return Price::create($data);
}
public static function update($data, $id = false)
public static function update($data, $id = false)
{
$id = $id ? $id : $data['id'];
$item = self::get($id);

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

@@ -33,7 +33,7 @@ class SaleChannels
return SaleChannel::create($data);
}
public static function update($data, $id = false)
public static function update($data, $id = false)
{
$id = $id ? $id : $data['id'];
$item = self::get($id);

11
app/Repositories/Shop/TagGroups.php
View File

@@ -29,8 +29,8 @@ class TagGroups
$group_tags[$tag->id] = $group->name . ' - ' . $tag->name;
}
$tags[] = [
'label' => $group->name,
'options' => $group_tags,
'label' => $group->name,
'options' => $group_tags,
];
}
return $tags;
@@ -63,9 +63,12 @@ class TagGroups
return TagGroup::create($data);
}
public static function update($data)
public static function update($data, $id = false)
{
return TagGroup::find($id)->update($data);
$id = $id ? $id : $data['id'];
$model = self::get($id);
$model->update($data);
return $model;
}
public static function destroy($id)

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

@@ -33,7 +33,7 @@ class TariffUnities
return TariffUnity::create($data);
}
public static function update($data, $id = false)
public static function update($data, $id = false)
{
$id = $id ? $id : $data['id'];
$item = self::get($id);

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

@@ -8,7 +8,7 @@ class Tariffs
{
public static function autocomplete($str)
{
$data = Tariff::where('name', 'LIKE', "%${str}%")->orWhere('ref', 'LIKE', "${str}%")->orWhere('code', 'LIKE', "${str}%")->orderBy('name')->limit(30)->get()->pluck('name', 'id');
$data = Tariff::byAutocomplete($str)->orderBy('name')->limit(30)->get()->pluck('name', 'id');
$export = [];
foreach ($data as $key => $name) {
$export[] = ['value' => $key, 'text' => $name];
@@ -18,7 +18,7 @@ class Tariffs
public static function getPrices($id)
{
return Tariff::with(['price_lists.price_list_values','price_lists.sale_channel'])->find($id);
return Tariff::with(['price_lists.price_list_values', 'price_lists.sale_channel'])->find($id);
}
public static function getOptions()
@@ -58,7 +58,7 @@ class Tariffs
return Tariff::create($data);
}
public static function update($data, $id = false)
public static function update($data, $id = false)
{
$id = $id ? $id : $data['id'];
$item = self::get($id);

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

@@ -12,10 +12,6 @@ use App\Models\Shop\Tax;
class Taxes
{
public static function getDatatable()
{
return Datatables::of($model)->make(true);
}
public static function getOptions()
{
@@ -44,7 +40,7 @@ class Taxes
return Tax::create($data);
}
public static function update($data, $id = false)
public static function update($data, $id = false)
{
$id = $id ? $id : $data['id'];
$item = self::get($id);

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

@@ -43,7 +43,7 @@ class Unities
return Unity::create($data);
}
public static function update($data, $id = false)
public static function update($data, $id = false)
{
$id = $id ? $id : $data['id'];
$item = self::get($id);

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

@@ -18,7 +18,7 @@ class Variations
public static function getOptions()
{
$variations = Variation::with(['package','unity'])->get();
$variations = Variation::with(['package', 'unity'])->get();
foreach ($variations as $variation) {
$data[$variation->id] = self::getName($variation);
}
@@ -28,7 +28,7 @@ class Variations
public static function getNameByID($id)
{
return self::getName(sef::getFull($id));
return self::getName(self::getFull($id));
}
public static function getName($variation)
@@ -48,7 +48,7 @@ class Variations
public static function getFull($id)
{
return Variation::with(['package','unity'])->findOrFail($id);
return Variation::with(['package', 'unity'])->findOrFail($id);
}
public static function get($id)