- {% if not table.rows.empty() %}
+ {% if count(table.rows) %}
{% block card %}
{{ form_open({ 'url': url_full() }) }}
diff --git a/addons/default/visiosoft/cats-module/src/Category/CategoryCollection.php b/addons/default/visiosoft/cats-module/src/Category/CategoryCollection.php
index 8e3ced75b..2dcaf9f18 100644
--- a/addons/default/visiosoft/cats-module/src/Category/CategoryCollection.php
+++ b/addons/default/visiosoft/cats-module/src/Category/CategoryCollection.php
@@ -1,16 +1,14 @@
filter(
- function ($category) {
- return (is_null($category->parent_category_id));
- }
- );
+ $category_repository = app(CategoryRepositoryInterface::class);
+ return $category_repository->getMainCategories();
}
}
diff --git a/addons/default/visiosoft/cats-module/src/Category/CategoryCriteria.php b/addons/default/visiosoft/cats-module/src/Category/CategoryCriteria.php
index 66c1390d1..b29907903 100644
--- a/addons/default/visiosoft/cats-module/src/Category/CategoryCriteria.php
+++ b/addons/default/visiosoft/cats-module/src/Category/CategoryCriteria.php
@@ -19,14 +19,7 @@ class CategoryCriteria extends EntryCriteria
$this->categoryRepository = $categoryRepository;
}
- public function getMainCats() {
- $mainCats = $this->categoryRepository->mainCats();
-
- foreach ($mainCats as $cat) {
- $subCount = $this->categoryRepository->newQuery()->where('parent_category_id', $cat->id)->count();
- $cat->hasChild = !!$subCount;
- }
-
- return $mainCats;
+ public function getMainCategories() {
+ return $this->categoryRepository->getMainCategories();
}
}
diff --git a/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php b/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php
index ccf3769cd..4eef167cc 100644
--- a/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php
+++ b/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php
@@ -1,196 +1,19 @@
where('cats_category.id', $id)
- ->whereRaw('deleted_at IS NULL')
- ->first();
+ return $this->seo_keyword;
}
- public function getParentCats($id, $type = null, $noMainCat = true)
+ public function getMetaDescription()
{
- $cat = $this->getCat($id);
- $catNames = array();
- $cat_ids = array();
- $catNames[] = $cat->name;
- $cat_ids[] = $cat->id;
- $subCat = $cat->parent_category_id;
- if ($subCat != null) {
- for ($i = 0; $i < 10; $i++) {
- $parCat = $this->getCat($subCat);
- if (isset($parCat)) {
- if ($parCat->parent_category_id == "") {
- if ($type == "add_main")
- $catNames[] = $parCat->name;
- if ($noMainCat) {
- break;
- }
- }
- $catNames[] = $parCat->name;
- $cat_ids[] = $parCat->id;
- $subCat = $parCat->parent_category_id;
- }
- }
- }
- if ($type == 'category_ids') {
- return CategoryModel::query()
- ->whereIn('cats_category.id', $cat_ids)
- ->whereRaw('deleted_at IS NULL')
- ->orderBy('cats_category.id', 'asc')
- ->get();
- }
- if ($type == "parent_id") {
- $cat_ids = array_reverse($cat_ids);
- return $cat_ids[0];
- }
- return $catNames;
- }
-
- public function getCatLevel($id)
- {
- //count parent and itself
- return count($this->getParentCats($id)) + 1;
- }
-
- public function getParentsCount($id)
- {
- $parentCats = array();
- $currentId = $id;
- do {
- $cat = $this->getCat($currentId);
- $catParent = $cat->parent_category_id;
- if ($catParent) {
- $currentId = $catParent;
- $parentCats[] = $catParent;
- }
- } while ($catParent);
- return count($parentCats);
- }
-
- public function getSubCategories($id, $get = null)
- {
- $sub_categories = $this->where('parent_category_id', $id)->get();
- if ($get == 'id') {
- $list_categories_id = array();
- foreach ($sub_categories as $item_category) {
- $list_categories_id[] = $item_category->id;
- }
- return $list_categories_id;
- }
- return $sub_categories;
- }
-
- public function getAllSubCategories($id)
- {
- $sub = $this->getSubCategories($id, 'id');
- for ($i = 0; $i <= count($sub) - 1; $i++) {
- $sub = array_merge($sub, $this->getSubCategories($sub[$i], 'id'));
- }
- return $sub;
- }
-
- public function deleteSubCategories($id)
- {
- $subCategories = $this->getAllSubCategories($id);
- if (count($subCategories)) {
- $this->newQuery()->whereIn('id', $subCategories)->delete();
- }
-
- return true;
- }
-
- public function searchKeyword($keyword, $selected = null)
- {
- $data = [];
- $cats = DB::table('cats_category');
- if ($selected != null) {
- if (strpos($selected, "-") !== false) {
- $selected = explode('-', $selected);
- $cats = $cats->whereNotIn('cats_category.id', $selected);
- } else {
- $cats = $cats->where('cats_category.id', '!=', $selected);
- }
- }
- $cats = $cats->where('name', 'like', $keyword . '%')
- ->whereRaw('deleted_at IS NULL');
-
- $cats = $cats->leftJoin('cats_category_translations', function ($join) {
- $join->on('cats_category.id', '=', 'cats_category_translations.entry_id');
- $join->whereIn('cats_category_translations.locale', [config('app.locale'), setting_value('streams::default_locale'), 'en']);//active lang
- });
- $cats = $cats->select('cats_category.*', 'cats_category_translations.name as name');
- $cats = $cats->orderBy('id', 'DESC')
- ->groupBy(['cats_category.id'])
- ->get();
- foreach ($cats as $cat) {
- $link = '';
- $parents = $this->getParentCats($cat->id, null, false);
- krsort($parents);
- foreach ($parents as $key => $parent) {
- if ($key == 0) {
- $link .= $parent . '';
- } else {
- $link .= $parent . ' > ';
- }
- }
- $data[] = array(
- 'id' => $cat->id,
- 'name' => $cat->name,
- 'parents' => $link,
- 'slug' => $cat->slug
- );
- }
- return $data;
- }
-
- public function getMainCategory()
- {
- return $this->where('parent_category_id', NULL)->get();
- }
-
- public function getMeta_keywords($cat_id)
- {
- return $this->find($cat_id)->seo_keyword;
- }
-
- public function getMeta_description($cat_id)
- {
- return $this->find($cat_id)->seo_description;
- }
-
- public function getMeta_title($cat_id)
- {
- return $this->find($cat_id)->name;
- }
-
- public function getMains($id)
- {
- $categories = array();
- $z = 1;
- for ($i = 1; $i <= $z; $i++) {
- if ($main = $this->newQuery()->where('id', $id)->first()) {
- $new = array();
- $new['id'] = $main->id;
- $new['val'] = $main->name;
- $new['slug'] = $main->slug;
- $categories[] = $new;
- if ($main->parent_category_id != null) {
- $id = $main->parent_category_id;
- $z++;
- }
- }
- }
- $categories = array_reverse($categories);
- unset($categories[count($categories) - 1]);
- return $categories;
+ return $this->seo_description;
}
public function getParent()
diff --git a/addons/default/visiosoft/cats-module/src/Category/CategoryPresenter.php b/addons/default/visiosoft/cats-module/src/Category/CategoryPresenter.php
index 3d1791434..37ab0d61e 100644
--- a/addons/default/visiosoft/cats-module/src/Category/CategoryPresenter.php
+++ b/addons/default/visiosoft/cats-module/src/Category/CategoryPresenter.php
@@ -1,30 +1,19 @@
find($id);
return $category->name;
}
- public function getname($id)
+ public function getParentCategoryById($id)
{
- $cat = CatsCategoryEntryModel::query()->find($id);
- return $cat->name;
- }
-
- public function getMains($id)
- {
- $category_model = new CategoryModel();
- return $category_model->getMains($id);
+ $category_repository = app(CategoryRepositoryInterface::class);
+ return $category_repository->getParentCategoryById($id);
}
}
diff --git a/addons/default/visiosoft/cats-module/src/Category/CategoryRepository.php b/addons/default/visiosoft/cats-module/src/Category/CategoryRepository.php
index 9d3af96a8..c3b01bcb5 100644
--- a/addons/default/visiosoft/cats-module/src/Category/CategoryRepository.php
+++ b/addons/default/visiosoft/cats-module/src/Category/CategoryRepository.php
@@ -1,148 +1,117 @@
model = $model;
$this->advRepository = $advRepository;
}
- public function findById($id)
+ public function getMainCategories()
{
- return $this->model->orderBy('created_at', 'DESC')->where('cats_category.id', $id)->first();
+ return $this->newQuery()
+ ->where('parent_category_id', null)
+ ->orderBy('sort_order')
+ ->get();
}
- public function mainCats()
- {
- return $this->model->where('parent_category_id', null)->orderBy('sort_order')->get();
- }
- public function getLevel2Cats()
+ public function getCategoriesLevel2()
{
$dBName = 'default_cats_category';
- $dBNamet = $dBName.'_translations';
+ $dBNamet = $dBName . '_translations';
- $catsDB = DB::table((DB::raw($dBName.' c1')))
- ->select(
- DB::raw('c1.id'),
- DB::raw('c1.slug'),
- DB::raw('c1.count'),
- DB::raw('c1.parent_category_id'),
- DB::raw('t1.name'),
+ $catsDB = DB::table((DB::raw($dBName . ' c1')))
+ ->select(
+ DB::raw('c1.id'),
+ DB::raw('c1.slug'),
+ DB::raw('c1.count'),
+ DB::raw('c1.parent_category_id'),
+ DB::raw('t1.name'),
- DB::raw('c2.id as c2_id'),
- DB::raw('c2.slug as c2_slug'),
- DB::raw('c2.count as c2_count'),
- DB::raw('c2.parent_category_id as c2_parent_category_id'),
- DB::raw('t2.name as c2_name')
- )
- ->leftJoin((DB::raw($dBName.' c2')), DB::raw('c2.parent_category_id'), '=', DB::raw('c1.id'))
- ->leftJoin((DB::raw($dBNamet.' t1')), DB::raw('c1.id'), '=', DB::raw('t1.entry_id'))
- ->leftJoin((DB::raw($dBNamet.' t2')), DB::raw('c2.id'), '=', DB::raw('t2.entry_id'))
- ->where(DB::raw('t1.locale'), Request()->session()->get('_locale', setting_value('streams::default_locale')))
- ->where(DB::raw('t2.locale'), Request()->session()->get('_locale', setting_value('streams::default_locale')))
- ->where(DB::raw("c1.deleted_at"),NULL)
- ->where(DB::raw("c2.deleted_at"),NULL)
- ->whereNull(DB::raw("c1.parent_category_id"))
- ->orderBy(DB::raw("c1.sort_order"))
- ->orderBy(DB::raw("c2.sort_order"))
- ->get();
+ DB::raw('c2.id as c2_id'),
+ DB::raw('c2.slug as c2_slug'),
+ DB::raw('c2.count as c2_count'),
+ DB::raw('c2.parent_category_id as c2_parent_category_id'),
+ DB::raw('t2.name as c2_name')
+ )
+ ->leftJoin((DB::raw($dBName . ' c2')), DB::raw('c2.parent_category_id'), '=', DB::raw('c1.id'))
+ ->leftJoin((DB::raw($dBNamet . ' t1')), DB::raw('c1.id'), '=', DB::raw('t1.entry_id'))
+ ->leftJoin((DB::raw($dBNamet . ' t2')), DB::raw('c2.id'), '=', DB::raw('t2.entry_id'))
+ ->where(DB::raw('t1.locale'), Request()->session()->get('_locale', setting_value('streams::default_locale')))
+ ->where(DB::raw('t2.locale'), Request()->session()->get('_locale', setting_value('streams::default_locale')))
+ ->where(DB::raw("c1.deleted_at"), NULL)
+ ->where(DB::raw("c2.deleted_at"), NULL)
+ ->whereNull(DB::raw("c1.parent_category_id"))
+ ->orderBy(DB::raw("c1.sort_order"))
+ ->orderBy(DB::raw("c2.sort_order"))
+ ->get();
$cats = collect([]);
$cats->subcats = $catsDB;
$cats->maincats = $catsDB->unique('id');
return $cats;
}
- public function getItem($cat)
+ public function getCategoryById($id)
{
- return $this->model->where('cats_category.id', $cat)->first();
- }
-
- public function getCatById($id)
- {
- return $this->model->where('cats_category.id', $id)->where('deleted_at', null)->orderBy('sort_order')->get();
- }
-
- public function getSubCatById($id)
- {
- $cats = $this->model->newQuery()
+ return $this->newQuery()
->where('parent_category_id', $id)
- ->get();
-
- foreach ($cats as $cat) {
- $subCount = $this->model->newQuery()->where('parent_category_id', $cat->id)->count();
- $cat->hasChild = !!$subCount;
- }
-
- return $cats;
- }
-
- public function getSingleCat($id)
- {
- return CatsCategoryEntryModel::query()->where('cats_category.id', $id)->first();
+ ->where('deleted_at', null)
+ ->orderBy('sort_order')->get();
}
public function findBySlug($slug)
{
- return $this->model->orderBy('created_at', 'DESC')->where('slug', $slug)->first();
+ return $this->newQuery()
+ ->where('slug', $slug)
+ ->first();
}
- public function getCategories()
+ public function getParentCategoryById($id)
{
- return $this->model->orderBy('sort_order')->get();
- }
-
- public function removeCatFromAds($category)
- {
- $catLevelNum = 1;
- if (!is_null($category->parent_category_id)) {
- $catLevelNum = $this->model->getCatLevel($category->id);
- }
- $catLevelText = "cat" . $catLevelNum;
-
- $advs = $this->advRepository->newQuery()->where($catLevelText, $category->id)->get();
- foreach ($advs as $adv) {
- $nullableCats = array();
- for ($i = $catLevelNum; $i <= 10; $i++) {
- $nullableCats['cat' . $i] = null;
+ if ($category = $this->find($id)) {
+ $parents_count = ($category->parent_category_id) ? 1 : 0;
+ $parents[] = $category;
+ for ($i = 0; $i < $parents_count; $i++) {
+ if ($category = $this->find($category->parent_category_id)) {
+ $parents[] = $category;
+ $parents_count++;
+ }
}
- $adv->update($nullableCats);
+
+ return $parents;
}
+ return null;
}
- public function DeleteCategories($id)
+ public function getLevelById($id)
{
- if (!is_null($category = $this->find($id))) {
- // Remove deleted category from ads
- $this->removeCatFromAds($category);
-
- // Delete the category
- $this->model->find($id)->delete();
-
- // Delete the subcategories
- $this->model->deleteSubCategories($id);
- }
+ return count($this->getParentCategoryById($id));
}
-}
+
+ public function getCategoriesByName($keyword)
+ {
+ $cats = DB::table('cats_category');
+
+ $cats = $cats->where('name', 'like', $keyword . '%')
+ ->whereRaw('deleted_at IS NULL');
+
+ $cats = $cats->leftJoin('cats_category_translations', function ($join) {
+ $join->on('cats_category.id', '=', 'cats_category_translations.entry_id');
+ $join->whereIn('cats_category_translations.locale', [config('app.locale'), setting_value('streams::default_locale'), 'en']);//active lang
+ })
+ ->select('cats_category.*', 'cats_category_translations.name as name')
+ ->orderBy('id', 'DESC')->groupBy(['cats_category.id'])->get();
+
+ return $cats;
+ }
+}
\ No newline at end of file
diff --git a/addons/default/visiosoft/cats-module/src/Category/Command/getLevel2Cats.php b/addons/default/visiosoft/cats-module/src/Category/Command/getCategoriesLevel2.php
similarity index 74%
rename from addons/default/visiosoft/cats-module/src/Category/Command/getLevel2Cats.php
rename to addons/default/visiosoft/cats-module/src/Category/Command/getCategoriesLevel2.php
index d35413978..06bf3e951 100644
--- a/addons/default/visiosoft/cats-module/src/Category/Command/getLevel2Cats.php
+++ b/addons/default/visiosoft/cats-module/src/Category/Command/getCategoriesLevel2.php
@@ -3,10 +3,10 @@ namespace Visiosoft\CatsModule\Category\Command;
use Visiosoft\CatsModule\Category\Contract\CategoryRepositoryInterface;
-class getLevel2Cats
+class getCategoriesLevel2
{
public function handle(CategoryRepositoryInterface $repo)
{
- return $repo->getLevel2Cats();
+ return $repo->getCategoriesLevel2();
}
}
diff --git a/addons/default/visiosoft/cats-module/src/Category/Contract/CategoryInterface.php b/addons/default/visiosoft/cats-module/src/Category/Contract/CategoryInterface.php
index 0e6e89b7b..8cd765413 100644
--- a/addons/default/visiosoft/cats-module/src/Category/Contract/CategoryInterface.php
+++ b/addons/default/visiosoft/cats-module/src/Category/Contract/CategoryInterface.php
@@ -4,31 +4,9 @@ use Anomaly\Streams\Platform\Entry\Contract\EntryInterface;
interface CategoryInterface extends EntryInterface
{
- public function getCat($id);
+ public function getMetaKeywords();
- public function getParentCats($id, $type = null);
-
- public function getCatLevel($id);
-
- public function getParentsCount($id);
-
- public function getSubCategories($id, $get = null);
-
- public function getAllSubCategories($id);
-
- public function deleteSubCategories($id);
-
- public function searchKeyword($keyword, $selected = null);
-
- public function getMainCategory();
-
- public function getMeta_keywords($cat_id);
-
- public function getMeta_description($cat_id);
-
- public function getMeta_title($cat_id);
-
- public function getMains($id);
+ public function getMetaDescription();
public function getParent();
}
diff --git a/addons/default/visiosoft/cats-module/src/Category/Contract/CategoryRepositoryInterface.php b/addons/default/visiosoft/cats-module/src/Category/Contract/CategoryRepositoryInterface.php
index f9907814e..edc7d2303 100644
--- a/addons/default/visiosoft/cats-module/src/Category/Contract/CategoryRepositoryInterface.php
+++ b/addons/default/visiosoft/cats-module/src/Category/Contract/CategoryRepositoryInterface.php
@@ -4,23 +4,15 @@ use Anomaly\Streams\Platform\Entry\Contract\EntryRepositoryInterface;
interface CategoryRepositoryInterface extends EntryRepositoryInterface
{
- public function findById($id);
+ public function getMainCategories();
- public function mainCats();
+ public function getCategoriesLevel2();
- public function getLevel2Cats();
-
- public function getItem($cat);
-
- public function getCatById($id);
-
- public function getSubCatById($id);
-
- public function getSingleCat($id);
+ public function getCategoryById($id);
public function findBySlug($slug);
- public function getCategories();
+ public function getParentCategoryById($id);
- public function DeleteCategories($id);
+ public function getLevelById($id);
}
diff --git a/addons/default/visiosoft/cats-module/src/Category/Listener/CalculatedTotalForEditedAdCategory.php b/addons/default/visiosoft/cats-module/src/Category/Listener/CalculatedTotalForEditedAdCategory.php
new file mode 100644
index 000000000..9399febbb
--- /dev/null
+++ b/addons/default/visiosoft/cats-module/src/Category/Listener/CalculatedTotalForEditedAdCategory.php
@@ -0,0 +1,57 @@
+categoryRepository = $categoryRepository;
+ }
+
+ public function handle(EditedAdCategory $event)
+ {
+ $ad_detail = $event->getAdDetail()->toArray();
+ $before_editing_ad = $event->getBeforeEditingParams();
+
+ //Categories New Ad
+ $category_fields_new_ad = preg_grep('/^cat/i', array_keys($ad_detail));
+ $category_fields_new_ad = array_combine($category_fields_new_ad, $category_fields_new_ad);
+
+ foreach ($category_fields_new_ad as $key => $field) {
+ $category_fields_new_ad[$key] = $ad_detail[$key];
+ }
+ $category_fields_new = array_filter($category_fields_new_ad);
+
+ //Categories Before Editing Ad
+ $category_fields_old_ad = preg_grep('/^cat/i', array_keys($before_editing_ad));
+ $category_fields_old_ad = array_combine($category_fields_old_ad, $category_fields_old_ad);
+
+ foreach ($category_fields_old_ad as $key => $field) {
+ $category_fields_old_ad[$key] = $before_editing_ad[$key];
+ }
+ $category_fields_old = array_filter($category_fields_old_ad);
+
+ //Update previous category Count
+ foreach ($category_fields_old as $category_id) {
+ if ($category = $this->categoryRepository->find($category_id)) {
+ $category->setAttribute('count', $category->count - 1);
+ $category->setAttribute('count_at', now());
+ $category->save();
+ }
+ }
+
+ //Update New Category Count
+ foreach ($category_fields_new as $category_id) {
+ if ($category = $this->categoryRepository->find($category_id)) {
+ $category->setAttribute('count', $category->count + 1);
+ $category->setAttribute('count_at', now());
+ $category->save();
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/addons/default/visiosoft/cats-module/src/Category/Listener/CalculatedTotalForNewAd.php b/addons/default/visiosoft/cats-module/src/Category/Listener/CalculatedTotalForNewAd.php
new file mode 100644
index 000000000..a6784ae6d
--- /dev/null
+++ b/addons/default/visiosoft/cats-module/src/Category/Listener/CalculatedTotalForNewAd.php
@@ -0,0 +1,36 @@
+categoryRepository = $categoryRepository;
+ }
+
+ public function handle(CreatedAd $event)
+ {
+ $ad_detail = $event->getAdDetail()->toArray();
+
+ $category_fields = preg_grep('/^cat/i', array_keys($ad_detail));
+ $category_fields = array_combine($category_fields, $category_fields);
+
+ foreach ($category_fields as $key => $field) {
+ $category_fields[$key] = $ad_detail[$key];
+ }
+
+ $category_fields = array_filter($category_fields);
+
+ foreach ($category_fields as $category_id) {
+ if ($category = $this->categoryRepository->find($category_id)) {
+ $category->setAttribute('count', $category->count + 1);
+ $category->setAttribute('count_at', now());
+ $category->save();
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/addons/default/visiosoft/cats-module/src/Category/Table/CategoryTableBuilder.php b/addons/default/visiosoft/cats-module/src/Category/Table/CategoryTableBuilder.php
index 902f0cfd1..595b5c978 100644
--- a/addons/default/visiosoft/cats-module/src/Category/Table/CategoryTableBuilder.php
+++ b/addons/default/visiosoft/cats-module/src/Category/Table/CategoryTableBuilder.php
@@ -86,7 +86,7 @@ class CategoryTableBuilder extends TableBuilder
* @var array
*/
protected $options = [
-
+ 'table_view' => 'visiosoft.module.cats::table/table'
];
/**
diff --git a/addons/default/visiosoft/cats-module/src/Category/Table/Handler/Delete.php b/addons/default/visiosoft/cats-module/src/Category/Table/Handler/Delete.php
index 0dea822bf..dc9e2da8a 100644
--- a/addons/default/visiosoft/cats-module/src/Category/Table/Handler/Delete.php
+++ b/addons/default/visiosoft/cats-module/src/Category/Table/Handler/Delete.php
@@ -13,7 +13,7 @@ class Delete extends ActionHandler
{
try {
foreach ($selected as $id) {
- $categoryRepository->DeleteCategories($id);
+ //Todo Delete category and Sub Categories
}
if ($selected) {
diff --git a/addons/default/visiosoft/cats-module/src/CatsModulePlugin.php b/addons/default/visiosoft/cats-module/src/CatsModulePlugin.php
index ff2905ce8..25a712f94 100644
--- a/addons/default/visiosoft/cats-module/src/CatsModulePlugin.php
+++ b/addons/default/visiosoft/cats-module/src/CatsModulePlugin.php
@@ -3,14 +3,19 @@
use Anomaly\Streams\Platform\Addon\Plugin\Plugin;
use Anomaly\Streams\Platform\Image\Command\MakeImageInstance;
-use Visiosoft\CatsModule\Category\Command\getLevel2Cats;
-use Visiosoft\CatsModule\Category\CategoryModel;
-use Visiosoft\CatsModule\Category\CategoryRepository;
+use Visiosoft\CatsModule\Category\Command\getCategoriesLevel2;
use Visiosoft\CatsModule\Category\Command\GetCategoryName;
use Visiosoft\CatsModule\Category\Command\GetCategoryDetail;
+use Visiosoft\CatsModule\Category\Contract\CategoryRepositoryInterface;
class CatsModulePlugin extends Plugin
{
+ protected $categoryRepository;
+
+ public function __construct(CategoryRepositoryInterface $categoryRepository)
+ {
+ $this->categoryRepository = $categoryRepository;
+ }
/**
* @return array
@@ -41,14 +46,12 @@ class CatsModulePlugin extends Plugin
), new \Twig_SimpleFunction(
'category_parents_name',
function ($id) {
- $category_model = new CategoryModel();
- return $category_model->getParentCats($id, 'add_main');
+ return $this->categoryRepository->getParentCategoryById($id);
}
), new \Twig_SimpleFunction(
'getParentsCount',
function ($id) {
- $category_model = new CategoryModel();
- return $category_model->getParentsCount($id);
+ return $this->categoryRepository->getParentCategoryById($id) - 1;
}
), new \Twig_SimpleFunction(
'catIcon',
@@ -56,16 +59,16 @@ class CatsModulePlugin extends Plugin
if ($path == "") {
return $this->dispatch(new MakeImageInstance('visiosoft.theme.base::images/default-categories-icon.png', 'img'))->url();
} else {
- return url('files/'.$path);
+ return url('files/' . $path);
}
}
), new \Twig_SimpleFunction(
- 'getLevel2Cats',
+ 'getCategoriesLevel2',
function () {
- if (!$getLevel2Cats = $this->dispatch(new getLevel2Cats())) {
+ if (!$getCategoriesLevel2 = $this->dispatch(new getCategoriesLevel2())) {
return 0;
}
- return $getLevel2Cats;
+ return $getCategoriesLevel2;
}
)
];
diff --git a/addons/default/visiosoft/cats-module/src/CatsModuleServiceProvider.php b/addons/default/visiosoft/cats-module/src/CatsModuleServiceProvider.php
index deb880a22..bc70385f1 100644
--- a/addons/default/visiosoft/cats-module/src/CatsModuleServiceProvider.php
+++ b/addons/default/visiosoft/cats-module/src/CatsModuleServiceProvider.php
@@ -1,11 +1,15 @@
[
- // Visiosoft\CatsModule\Listener\ExampleListener::class,
- //],
+ CreatedAd::class => [
+ CalculatedTotalForNewAd::class,
+ ],
+ EditedAdCategory::class => [
+ CalculatedTotalForEditedAdCategory::class,
+ ],
];
/**
@@ -193,7 +200,7 @@ class CatsModuleServiceProvider extends AddonServiceProvider
'category' => [
'buttons' => [
'new_category' => [
- 'href' => '/admin/cats/create?parent='.$request->cat
+ 'href' => '/admin/cats/create?parent=' . $request->cat
],
],
]
diff --git a/addons/default/visiosoft/cats-module/src/Http/Controller/Admin/CategoryController.php b/addons/default/visiosoft/cats-module/src/Http/Controller/Admin/CategoryController.php
index 3d44cf98c..cc727c9b6 100644
--- a/addons/default/visiosoft/cats-module/src/Http/Controller/Admin/CategoryController.php
+++ b/addons/default/visiosoft/cats-module/src/Http/Controller/Admin/CategoryController.php
@@ -6,6 +6,7 @@ use DateTime;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Str;
+use Visiosoft\AdvsModule\Adv\Event\CreatedCategory;
use Visiosoft\CatsModule\Category\CategoryModel;
use Visiosoft\CatsModule\Category\Contract\CategoryRepositoryInterface;
use Visiosoft\CatsModule\Category\Form\CategoryFormBuilder;
@@ -36,7 +37,7 @@ class CategoryController extends AdminController
if ($this->request->action == "delete") {
$CategoriesModel = new CategoryModel();
foreach ($this->request->id as $item) {
- $CategoriesModel->deleteSubCategories($item);
+ //Todo Delete sub Categories
}
}
if (!isset($request->cat) || $request->cat == "") {
@@ -113,7 +114,7 @@ class CategoryController extends AdminController
}
}
if (empty($isMultiCat)) {
- $this->categoryRepository->create(array_merge($translatableEntries, [
+ $category = $this->categoryRepository->create(array_merge($translatableEntries, [
'slug' => $all['slug'],
'parent_category' => $all['parent_category'] === "" ? null : $all['parent_category'],
'icon' => $all['icon'],
@@ -135,6 +136,8 @@ class CategoryController extends AdminController
}
};
+ $this->catLevelCalc();
+
// $this->categoryRepository->create(array_merge($translatableEntries, [
// 'slug' => $all['slug'],
// 'parent_category' => $all['parent_category'],
@@ -186,9 +189,9 @@ class CategoryController extends AdminController
public function delete(CategoryRepositoryInterface $categoryRepository, Request $request, CategoryModel $categoryModel, $id)
{
- $categoryRepository->DeleteCategories($id);
+ //Todo Delete Category and Sub Categories
if ($request->parent != "") {
- $subCats = $categoryRepository->getSubCatById($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.']);
}
@@ -205,7 +208,7 @@ class CategoryController extends AdminController
$parentCat = $this->categoryRepository->find($parentCatId);
if (is_null($parentCat) && !is_null($parentCatId)) {
$this->categoryEntryTranslationsModel->where('entry_id', $cat->id)->delete();
- $this->categoryRepository->DeleteCategories($cat->id);
+ //Todo Delete Category and Sub Categories
$deletedCatsCount++;
}
}
@@ -250,8 +253,8 @@ class CategoryController extends AdminController
->get();
foreach ($result as $key => $data) {
$id = $data->id;
- $CategoriesModel = new CategoryModel();
- $level = $CategoriesModel->getCatLevel($id);
+ $category_repository = app(CategoryRepositoryInterface::class);
+ $level = $category_repository->getLevelById($id);
DB::table('cats_category')->where('id',$id)->update(array(
'level'=>$level,