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

add offers count, & minor fixes code standards

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2021-11-01 16:26:31 +01:00
parent e97f54f126
commit 18f1f8a13a
66 changed files with 526 additions and 574 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Datatables/Admin/Core/CommentsDataTable.php
View File

@@ -20,7 +20,7 @@ class CommentsDataTable extends DataTable
public function query(Comment $model)
{
$model = $model::with(['user'])->select('*');
return self::buildQuery($model);
return $this->buildQuery($model);
}
protected function getColumns()
@@ -29,7 +29,7 @@ class CommentsDataTable extends DataTable
Column::make('updated_at')->title(__('date'))->width('80')->class('text-center')->searchable(false),
Column::make('user.name')->title(__('name'))->searchable(false),
Column::make('comment')->title(__('comments'))->searchable(false),
self::makeColumnButtons(),
$this->makeColumnButtons(),
];
}
}

4
app/Datatables/Botanic/FamiliesDataTable.php
View File

@@ -13,7 +13,7 @@ class FamiliesDataTable extends DataTable
public function query(Family $model)
{
$model = $model::withCount(['genres','species','varieties']);
return self::buildQuery($model);
return $this->buildQuery($model);
}
protected function getColumns()
@@ -25,7 +25,7 @@ class FamiliesDataTable extends DataTable
Column::make('genres_count')->title('Nb genres')->searchable(false)->addClass('text-right'),
Column::make('species_count')->title('Nb espèces')->searchable(false)->addClass('text-right'),
Column::make('varieties_count')->title('Nb variétés')->searchable(false)->addClass('text-right'),
self::makeColumnButtons(),
$this->makeColumnButtons(),
];
}
}

14
app/Datatables/Botanic/GenresDataTable.php
View File

@@ -13,19 +13,17 @@ class GenresDataTable extends DataTable
public function query(Genre $model)
{
$model = $model::with('family')->withCount('species')->withCount('varieties');
return self::buildQuery($model);
return $this->buildQuery($model);
}
public function modifier($datatables)
{
$datatables
->editColumn(
'family_name', function (Genre $genre) {
return $genre->family ? $genre->family->name : '';
}
)
->editColumn('family_name', function (Genre $genre) {
return $genre->family ? $genre->family->name : '';
})
->rawColumns(['genre_name', 'action']);
return Parent::modifier($datatables);
return parent::modifier($datatables);
}
protected function getColumns()
@@ -37,7 +35,7 @@ class GenresDataTable extends DataTable
Column::make('family.name')->data('family_name')->title('Famille'),
Column::make('species_count')->title('Nb Espèces')->searchable(false)->addClass('text-right'),
Column::make('varieties_count')->title('Nb Variétés')->searchable(false)->addClass('text-right'),
self::makeColumnButtons(),
$this->makeColumnButtons(),
];
}
}

14
app/Datatables/Botanic/SpeciesDataTable.php
View File

@@ -13,19 +13,17 @@ class SpeciesDataTable extends DataTable
public function query(Specie $model)
{
$model = $model::withCount('varieties')->with('genre');
return self::buildQuery($model);
return $this->buildQuery($model);
}
public function modifier($datatables)
{
$datatables
->editColumn(
'genre_name', function (Specie $specie) {
return $specie->genre ? $specie->genre->name : '';
}
)
->editColumn('genre_name', function (Specie $specie) {
return $specie->genre ? $specie->genre->name : '';
})
->rawColumns(['genre_name', 'action']);
return Parent::modifier($datatables);
return parent::modifier($datatables);
}
@@ -37,7 +35,7 @@ class SpeciesDataTable extends DataTable
Column::make('genre.name')->data('genre_name')->title('Genre'),
Column::make('latin'),
Column::make('varieties_count')->title('Nb variétés')->searchable(false)->addClass('text-right'),
self::makeColumnButtons(),
$this->makeColumnButtons(),
];
}
}

20
app/Datatables/Botanic/VarietiesDataTable.php
View File

@@ -14,23 +14,21 @@ class VarietiesDataTable extends DataTable
{
// $model = $model::with('specie')->withCount('Articles')->select('botanic_varieties.*');
$model = $model::joinRelationship('Specie')->select('botanic_varieties.*', 'botanic_species.name as specie_name')->with('Specie')->withCount('Articles');
return self::buildQuery($model);
return $this->buildQuery($model);
}
public function modifier($datatables)
{
$datatables
->editColumn(
'photo', function (Variety $variety) {
$media = $variety->getFirstMedia();
// dump($media);
// return $media('thumb');
return '';
}
)
->editColumn('photo', function (Variety $variety) {
$media = $variety->getFirstMedia();
// dump($media);
// return $media('thumb');
return '';
})
->rawColumns(['photo', 'action']);
return Parent::modifier($datatables);
return parent::modifier($datatables);
}
@@ -41,7 +39,7 @@ class VarietiesDataTable extends DataTable
Column::make('name')->title('Nom'),
Column::make('articles_count')->title('Nb articles')->class('text-right')->searchable(false),
Column::make('photo')->title('')->searchable(false)->orderable(false),
self::makeColumnButtons(),
$this->makeColumnButtons(),
];
}
}

6
app/Datatables/Shop/ArticleNaturesDataTable.php
View File

@@ -13,15 +13,15 @@ class ArticleNaturesDataTable extends DataTable
public function query(ArticleNature $model)
{
$model = $model::withCount('Articles');
return self::buildQuery($model);
return $this->buildQuery($model);
}
protected function getColumns()
{
return [
Column::make('name')->title('Nom'),
Column::make('articles_count')->title('Nb articles')->addClass('text-right'),
self::makeColumnButtons(),
Column::make('articles_count')->title('Nb articles')->addClass('text-right')->searchable(false),
$this->makeColumnButtons(),
];
}
}

23
app/Datatables/Shop/ArticlesDataTable.php
View File

@@ -15,37 +15,36 @@ class ArticlesDataTable extends DataTable
public function query(Article $model)
{
$model = $model::with(['article_nature','image'])->withCount(['categories', 'tags'])->joinRelationship('article_nature');
$model = self::filterByArticleNature($model);
return self::buildQuery($model);
$model = $model::with(['article_nature', 'image'])->withCount(['categories', 'tags', 'offers'])->joinRelationship('article_nature');
$model = self::filterByArticleNature($model);
return $this->buildQuery($model);
}
public static function filterByArticleNature($model, $article_nature_id = false)
{
$article_nature_id = $article_nature_id ? $article_nature_id : self::isFilteredByField('article_nature_id');
return $article_nature_id ? $model->byArticleNature($article_nature_id) : $model;
}
}
public function modifier($datatables)
{
$datatables
->editColumn('thumb', function (Article $article) {
return '<img src="' . Articles::getThumbSrc($article->image) . '">';
})
->rawColumns(['thumb','action']);
$datatables->editColumn('thumb', function (Article $article) {
return '<img src="' . Articles::getThumbSrc($article->image) . '">';
})
->rawColumns(['thumb', 'action']);
return parent::modifier($datatables);
}
protected function getColumns()
{
return [
Column::make('article_nature.name')->title('Nature'),
Column::make('thumb')->searchable(false)->width(40)->class('text-center'),
Column::make('thumb')->searchable(false)->orderable(false)->width(40)->class('text-center'),
Column::make('name')->title('Nom'),
Column::make('tags_count')->title('Tags')->class('text-right')->searchable(false),
Column::make('categories_count')->title('Rayons')->class('text-right')->searchable(false),
self::makeColumnButtons(),
Column::make('offers_count')->title('Offres')->class('text-right')->searchable(false),
$this->makeColumnButtons(),
];
}
}

4
app/Datatables/Shop/CategoriesDataTable.php
View File

@@ -13,7 +13,7 @@ class CategoriesDataTable extends DataTable
public function query(Category $model)
{
$model = $model::withCount('articles');
return self::buildQuery($model);
return $this->buildQuery($model);
}
protected function getColumns()
@@ -21,7 +21,7 @@ class CategoriesDataTable extends DataTable
return [
Column::make('name')->title('Nom'),
Column::make('articles_count')->title('Nb Articles')->class('text-right')->searchable(false),
self::makeColumnButtons(),
$this->makeColumnButtons(),
];
}
}

4
app/Datatables/Shop/CustomersDataTable.php
View File

@@ -12,7 +12,7 @@ class CustomersDataTable extends DataTable
public function query(Customer $model)
{
return self::buildQuery($model);
return $this->buildQuery($model);
}
protected function getColumns()
@@ -22,7 +22,7 @@ class CustomersDataTable extends DataTable
Column::make('address')->title('Adresse'),
Column::make('zipcode')->title('Code postal'),
Column::make('city')->title('Ville'),
self::makeColumnButtons(),
$this->makeColumnButtons(),
];
}
}

14
app/Datatables/Shop/DeliveriesDataTable.php
View File

@@ -12,15 +12,21 @@ class DeliveriesDataTable extends DataTable
public function query(Delivery $model)
{
$model = $model->with('SaleChannel');
return self::buildQuery($model);
$model = $model->with('sale_channel');
return $this->buildQuery($model);
}
public function modifier($datatables)
{
$datatables
->editColumn('active', function (Delivery $delivery) {
return view("components.form.toggle", ['value' => $delivery->active, 'on' => __('active'), 'off' => __('inactive'), 'meta' => 'data-id='.$delivery->id, 'size' => 'sm']);
return view("components.form.toggle", [
'value' => $delivery->active,
'on' => __('active'),
'off' => __('inactive'),
'meta' => 'data-id='.$delivery->id,
'size' => 'sm',
]);
})
->rawColumns(['active', 'action']);
return parent::modifier($datatables);
@@ -35,7 +41,7 @@ class DeliveriesDataTable extends DataTable
Column::make('address')->title('Adresse'),
Column::make('zipcode')->title('Code postal'),
Column::make('city')->title('Ville'),
self::makeColumnButtons(),
$this->makeColumnButtons(),
];
}
}

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

@@ -12,7 +12,7 @@ class InvoicesDataTable extends DataTable
public function query(Invoice $model)
{
return self::buildQuery($model);
return $this->buildQuery($model);
}
protected function getColumns()
@@ -21,7 +21,7 @@ class InvoicesDataTable extends DataTable
Column::make('status.name'),
Column::make('customer.name'),
Column::make('total'),
self::makeColumnButtons(),
$this->makeColumnButtons(),
];
}
}

7
app/Datatables/Shop/OffersDataTable.php
View File

@@ -12,17 +12,18 @@ class OffersDataTable extends DataTable
public function query(Offer $model)
{
$model = $model->with(['article','variation','tariff'])->select(['shop_offers.*']);
return self::buildQuery($model);
$model = $model->with(['article.article_nature', 'variation', 'tariff']);
return $this->buildQuery($model);
}
protected function getColumns()
{
return [
Column::make('article.name')->title('Article'),
Column::make('article.article_nature.name')->title('Nature'),
Column::make('variation.name')->title('Déclinaison'),
Column::make('tariff.name')->title('Tarif'),
self::makeColumnButtons(),
$this->makeColumnButtons(),
];
}
}

6
app/Datatables/Shop/OrdersDataTable.php
View File

@@ -10,16 +10,16 @@ class OrdersDataTable extends DataTable
{
public $model_name = 'orders';
public function query(Product $model)
public function query(Order $model)
{
return self::buildQuery($model);
return $this->buildQuery($model);
}
protected function getColumns()
{
return [
Column::make('name'),
self::makeColumnButtons(),
$this->makeColumnButtons(),
];
}
}

4
app/Datatables/Shop/PackagesDataTable.php
View File

@@ -13,7 +13,7 @@ class PackagesDataTable extends DataTable
public function query(Package $model)
{
$model = $model->withCount(['variations','offers']);
return self::buildQuery($model);
return $this->buildQuery($model);
}
protected function getColumns()
@@ -22,7 +22,7 @@ class PackagesDataTable extends DataTable
Column::make('value')->title('Valeur'),
Column::make('variations_count')->title('nb variations')->searchable(false)->class('text-right'),
Column::make('offers_count')->title('nb offres')->searchable(false)->class('text-right'),
self::makeColumnButtons(),
$this->makeColumnButtons(),
];
}
}

4
app/Datatables/Shop/PriceGenericCategoriesDataTable.php
View File

@@ -13,7 +13,7 @@ class PriceGenericCategoriesDataTable extends DataTable
public function query(PriceGenericCategory $model)
{
$model = $model->withCount('price_generics');
return self::buildQuery($model);
return $this->buildQuery($model);
}
protected function getColumns()
@@ -21,7 +21,7 @@ class PriceGenericCategoriesDataTable extends DataTable
return [
Column::make('name')->title('Nom'),
Column::make('price_generics_count')->title('Nb Tarifs')->class('text-right'),
self::makeColumnButtons(),
$this->makeColumnButtons(),
];
}
}

4
app/Datatables/Shop/PriceListsDataTable.php
View File

@@ -20,7 +20,7 @@ class PriceListsDataTable extends DataTable
{
$model = $model->with(['sale_channel','price_list_values']);
$model = self::filterByTariff($model);
return self::buildQuery($model);
return $this->buildQuery($model);
}
public static function filterByTariff($model, $tariff_id = false)
@@ -49,7 +49,7 @@ class PriceListsDataTable extends DataTable
Column::make('name')->title('Nom'),
Column::make('sale_channel.name')->title('Canal de vente'),
Column::make('tariff_id')->title('Liste de prix'),
self::makeColumnButtons(),
$this->makeColumnButtons(),
];
}
}

6
app/Datatables/Shop/SaleChannelsDataTable.php
View File

@@ -13,7 +13,7 @@ class SaleChannelsDataTable extends DataTable
public function query(SaleChannel $model)
{
$model = $model->withCount('deliveries');
return self::buildQuery($model);
return $this->buildQuery($model);
}
protected function getColumns()
@@ -21,8 +21,8 @@ class SaleChannelsDataTable extends DataTable
return [
Column::make('code')->title('Code abrégé')->width(100),
Column::make('name')->title('Nom'),
Column::make('deliveries_count')->title(__('shop.deliveries.list'))->searchable(false),
self::makeColumnButtons(),
Column::make('deliveries_count')->title(__('shop.deliveries.list'))->searchable(false)->class('text-right'),
$this->makeColumnButtons(),
];
}
}

4
app/Datatables/Shop/TagGroupsDataTable.php
View File

@@ -13,7 +13,7 @@ class TagGroupsDataTable extends DataTable
public function query(TagGroup $model)
{
$model = $model::withCount('tags');
return self::buildQuery($model);
return $this->buildQuery($model);
}
protected function getColumns()
@@ -21,7 +21,7 @@ class TagGroupsDataTable extends DataTable
return [
Column::make('name'),
Column::make('tags_count')->title('Nb de tags')->searchable(false)->addClass('text-right'),
self::makeColumnButtons(),
$this->makeColumnButtons(),
];
}
}

12
app/Datatables/Shop/TagsDataTable.php
View File

@@ -13,8 +13,8 @@ class TagsDataTable extends DataTable
public function query(Tag $model)
{
$model = $model::with('group')->withCount(['articles','species','varieties']);
return self::buildQuery($model);
$model = $model::with('group')->withCount(['articles', 'species', 'varieties']);
return $this->buildQuery($model);
}
protected function getColumns()
@@ -22,10 +22,10 @@ class TagsDataTable extends DataTable
return [
Column::make('group.name')->title('Groupe'),
Column::make('name')->title('Nom'),
Column::make('articles_count')->title('Articles')->class('text-right'),
Column::make('species_count')->title('Espèces')->class('text-right'),
Column::make('varieties_count')->title('Variétés')->class('text-right'),
self::makeColumnButtons(),
Column::make('articles_count')->title('Articles')->class('text-right')->searchable(false),
Column::make('species_count')->title('Espèces')->class('text-right')->searchable(false),
Column::make('varieties_count')->title('Variétés')->class('text-right')->searchable(false),
$this->makeColumnButtons(),
];
}
}

4
app/Datatables/Shop/TariffsDataTable.php
View File

@@ -14,7 +14,7 @@ class TariffsDataTable extends DataTable
public function query(Tariff $model)
{
$model = $model->with(['sale_channel'])->select(['shop_tariffs.*']);
return self::buildQuery($model);
return $this->buildQuery($model);
}
public function modifier($datatables)
@@ -36,7 +36,7 @@ class TariffsDataTable extends DataTable
Column::make('sale_channel.name')->title('Canal de vente par défaut'),
Column::make('code')->title('Code'),
Column::make('ref')->title('Référence'),
self::makeColumnButtons(),
$this->makeColumnButtons(),
];
}
}

4
app/Datatables/Shop/UnitiesDataTable.php
View File

@@ -12,14 +12,14 @@ class UnitiesDataTable extends DataTable
public function query(Unity $model)
{
return self::buildQuery($model);
return $this->buildQuery($model);
}
protected function getColumns()
{
return [
Column::make('value')->title('Valeur'),
self::makeColumnButtons(),
$this->makeColumnButtons(),
];
}
}

11
app/Datatables/Shop/VariationsDataTable.php
View File

@@ -12,18 +12,19 @@ class VariationsDataTable extends DataTable
public function query(Variation $model)
{
$model = $model->with(['package','unity'])->select($model->table . 'shop_variations.*');
return self::buildQuery($model);
$model = $model->with(['package','unity'])->withCount('offers');
return $this->buildQuery($model);
}
protected function getColumns()
{
return [
Column::make('package.value')->title('Package'),
Column::make('quantity')->title('Quantité')->class('text-right'),
Column::make('unity.value')->title('Unité'),
Column::make('quantity')->title('Quantité')->class('text-right')->with(80),
Column::make('unity.value')->title('Unité')->searchable(false)->with(80),
Column::make('description')->title('Description'),
self::makeColumnButtons(),
Column::make('offers_count')->title('Offres')->searchable(false)->class('text-right'),
$this->makeColumnButtons(),
];
}
}