hotstovejer/openclassify
0
0
Fork 0
mirror of https://github.com/openclassify/openclassify.git synced 2026-01-11 18:01:10 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #956 from openclassify/vedat3.8

Browse Source 
fixed delete categories
This commit is contained in:
Fatih Alp 2021-02-18 10:12:01 +03:00 committed by GitHub
commit 9048aeff46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 122 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/default/visiosoft/cats-module/src/Category/CategoryRepository.php
View File

@ -114,4 +114,9 @@ class CategoryRepository extends EntryRepository implements CategoryRepositoryIn
return $cats;
}
public function getDeletedCategories()
{
return $this->newQuery()->whereNotNull('deleted_at')->get();
}
}

2
addons/default/visiosoft/cats-module/src/Category/Contract/CategoryRepositoryInterface.php
View File

@ -15,4 +15,6 @@ interface CategoryRepositoryInterface extends EntryRepositoryInterface
public function getParentCategoryById($id);
public function getLevelById($id);
public function getDeletedCategories();
}

26
addons/default/visiosoft/cats-module/src/Category/Table/CategoryTableBuilder.php
View File

@ -45,32 +45,6 @@ class CategoryTableBuilder extends TableBuilder
'name',
];
/**
* The table buttons.
*
* @var array|string
*/
protected $buttons = [
'edit' => [
'href' => '/admin/cats/edit/{entry.id}?parent={entry.parent_category_id}'
],
'add_sub_category' => [
'icon' => 'fa fa-caret-square-o-down',
'type' => 'success',
'href' => '/admin/cats/create?parent={entry.id}'
],
'sub_category' => [
'icon' => 'fa fa-caret-square-o-down',
'type' => 'success',
'href' => '/admin/cats?cat={entry.id}'
],
'delete' => [
'icon' => 'fa fa-trash',
'type' => 'danger',
'href' => '/admin/cats/category/delete/{entry.id}?parent={entry.parent_category_id}'
]
];
/**
* The table actions.
*

34
addons/default/visiosoft/cats-module/src/Category/Table/CategoryTableButtons.php Normal file
View File

@ -0,0 +1,34 @@
<?php namespace Visiosoft\CatsModule\Category\Table;
use Anomaly\Streams\Platform\Entry\Contract\EntryInterface;
class CategoryTableButtons
{
public function handle(CategoryTableBuilder $builder)
{
$builder->setButtons([
'edit' => [
'href' => '/admin/cats/edit/{entry.id}?parent={entry.parent_category_id}'
],
'add_sub_category' => [
'icon' => 'fa fa-caret-square-o-down',
'type' => 'success',
'href' => '/admin/cats/create?parent={entry.id}'
],
'sub_category' => [
'icon' => 'fa fa-caret-square-o-down',
'type' => 'success',
'href' => '/admin/cats?cat={entry.id}'
],
'delete' => [
'icon' => 'fa fa-trash',
'type' => 'danger',
'href' => function(EntryInterface $entry)
{
return route('visiosoft.module.cats::admin.delete_category', ['id' => $entry->getId()])."?parent=".$entry->parent_category_id;
}
]
]);
}
}

22
addons/default/visiosoft/cats-module/src/Category/Table/Handler/Delete.php
View File

@ -1,26 +1,14 @@
<?php namespace Visiosoft\CatsModule\Category\Table\Handler;
use Anomaly\Streams\Platform\Ui\Table\Component\Action\ActionHandler;
use Visiosoft\CatsModule\Category\Contract\CategoryRepositoryInterface;
use Visiosoft\CatsModule\Category\Table\CategoryTableBuilder;
use Visiosoft\CatsModule\Category\Traits\DeleteCategory;
class Delete extends ActionHandler
{
public function handle(
CategoryTableBuilder $builder, array $selected,
CategoryRepositoryInterface $categoryRepository
)
{
try {
foreach ($selected as $id) {
//Todo Delete category and Sub Categories
}
use DeleteCategory;
if ($selected) {
$this->messages->success(trans('visiosoft.module.cats::message.categories_mass_delete_success'));
}
} catch (\Exception $e) {
$this->messages->error($e->getMessage());
}
public function handle(array $selected)
{
$this->deleteCategories($selected);
}
}

42
addons/default/visiosoft/cats-module/src/Category/Traits/DeleteCategory.php Normal file
View File

@ -0,0 +1,42 @@
<?php namespace Visiosoft\CatsModule\Category\Traits;
use Anomaly\Streams\Platform\Message\MessageBag;
use Anomaly\Streams\Platform\Model\EloquentModel;
use Visiosoft\CatsModule\Category\CategoryModel;
trait DeleteCategory
{
public function deleteCategories(array $selected)
{
$messages = app(MessageBag::class);
$count = 0;
foreach ($selected as $id) {
if ($this->deleteCategory($id)) {
$count++;
}
}
if ($selected && $count > 0) {
$messages->success(trans('streams::message.delete_success', compact('count')));
}
}
public function deleteCategory($id)
{
$model = new CategoryModel();
$entry = $model->find($id);
$deletable = true;
if ($entry instanceof EloquentModel) {
$deletable = $entry->isDeletable();
}
if ($entry && $deletable && $entry->delete()) {
return true;
}
return false;
}
}

7
addons/default/visiosoft/cats-module/src/CatsModuleServiceProvider.php
View File

@ -55,14 +55,17 @@ class CatsModuleServiceProvider extends AddonServiceProvider
* @type array|null
*/
protected $routes = [
'admin/cats/clean_subcats' => 'Visiosoft\CatsModule\Http\Controller\Admin\CategoryController@cleanSubcats',
'admin/cats/clean_subcats' => 'Visiosoft\CatsModule\Http\Controller\Admin\CategoryController@cleanSubCategories',
'admin/cats/adcountcalc' => 'Visiosoft\CatsModule\Http\Controller\Admin\CategoryController@adCountCalc',
'admin/cats/catlevelcalc' => 'Visiosoft\CatsModule\Http\Controller\Admin\CategoryController@catLevelCalc',
'admin/cats' => 'Visiosoft\CatsModule\Http\Controller\Admin\CategoryController@index',
'admin/cats/create' => 'Visiosoft\CatsModule\Http\Controller\Admin\CategoryController@create',
'admin/cats/edit/{id}' => 'Visiosoft\CatsModule\Http\Controller\Admin\CategoryController@edit',
'admin/cats/category/delete/{id}' => 'Visiosoft\CatsModule\Http\Controller\Admin\CategoryController@delete',
'admin/cats/category/delete/{id}' => [
'as' => 'visiosoft.module.cats::admin.delete_category',
'uses' => 'Visiosoft\CatsModule\Http\Controller\Admin\CategoryController@delete',
],
// Sitemap
'sitemap.xml' => 'Visiosoft\CatsModule\Http\Controller\SitemapController@index',

54
addons/default/visiosoft/cats-module/src/Http/Controller/Admin/CategoryController.php
View File

@ -16,6 +16,7 @@ use Visiosoft\CatsModule\Category\Form\CategoryFormBuilder;
use Visiosoft\CatsModule\Category\Table\CategoryTableBuilder;
use Anomaly\Streams\Platform\Http\Controller\AdminController;
use Visiosoft\AdvsModule\Adv\Contract\AdvRepositoryInterface;
use Visiosoft\CatsModule\Category\Traits\DeleteCategory;
class CategoryController extends AdminController
{
@ -23,6 +24,8 @@ class CategoryController extends AdminController
private $categoryEntryTranslationsModel;
private $str;
use DeleteCategory;
public function __construct(
CategoryRepositoryInterface $categoryRepository,
CatsCategoryEntryTranslationsModel $categoryEntryTranslationsModel,
@ -37,11 +40,6 @@ class CategoryController extends AdminController
public function index(CategoryTableBuilder $table, Request $request)
{
if ($this->request->action == "delete") {
foreach ($this->request->id as $item) {
//Todo Delete sub Categories
}
}
if (!isset($request->cat) || $request->cat == "") {
$categories = CategoryModel::query()->where('parent_category_id', '')->orWhereNull('parent_category_id')->get();
$categories = $categories->where('deleted_at', null);
@ -199,32 +197,38 @@ class CategoryController extends AdminController
return $this->view->make('visiosoft.module.cats::cats/admin-cat')->with('id', $id);
}
public function delete(CategoryRepositoryInterface $categoryRepository, Request $request, CategoryModel $categoryModel, $id)
public function delete(CategoryRepositoryInterface $categoryRepository, $id)
{
//Todo Delete Category and Sub Categories
if ($request->parent != "") {
$subCats = $categoryRepository->getCategoryById($request->parent);
if (count($subCats)) {
return redirect('admin/cats?cat=' . $request->parent)->with('success', ['Category and related sub-categories deleted successfully.']);
if ($this->deleteCategory($id)) {
$this->messages->success(trans('streams::message.delete_success', ['count' => 1]));
}
if (!empty($parent = $this->request->parent)) {
if (count($categoryRepository->getCategoryById($parent))) {
return redirect('admin/cats?cat=' . $parent);
}
}
return redirect('admin/cats')->with('success', ['Category and related sub-categories deleted successfully.']);
return redirect('admin/cats');
}
public function cleanSubcats()
public function cleanSubCategories()
{
$cats = $this->categoryRepository->all();
$deletedCatsCount = 0;
foreach ($cats as $cat) {
$parentCatId = $cat->parent_category_id;
$parentCat = $this->categoryRepository->find($parentCatId);
if (is_null($parentCat) && !is_null($parentCatId)) {
$this->categoryEntryTranslationsModel->where('entry_id', $cat->id)->delete();
//Todo Delete Category and Sub Categories
$deletedCatsCount++;
}
}
return redirect('admin/cats')->with('success', [$deletedCatsCount . ' categories has been deleted.']);
// $cats = $this->categoryRepository->getDeletedCategories();
//
// $delete_category_keys = $cats->pluck('id');
//
// dd($delete_category_keys);
//
// foreach ($cats as $cat) {
// $parentCatId = $cat->parent_category_id;
// $parentCat = $this->categoryRepository->find($parentCatId);
// if (is_null($parentCat) && !is_null($parentCatId)) {
// $this->categoryEntryTranslationsModel->where('entry_id', $cat->id)->delete();
// //Todo Sub Categories
// $deletedCatsCount++;
// }
// }
return redirect('admin/cats');
}
public function adCountCalc()