From 16c8d71b99791ef371cc20411772b299dd581346 Mon Sep 17 00:00:00 2001 From: Dia Date: Thu, 6 Jan 2022 17:31:17 +0300 Subject: [PATCH 1/2] =?UTF-8?q?#5107=20Asfaltdunyas=C4=B1=20mobile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/views/list/list.twig | 8 ++-- .../views/list/partials/breadcrumb.twig | 4 +- .../views/list/partials/filter-modal.twig | 4 +- .../views/list/partials/list-filter.twig | 42 ++++++++--------- .../list/partials/mobile-breadcrumb.twig | 2 +- .../views/list/partials/mobile-list.twig | 46 +++++++++++++++++++ .../src/Http/Controller/AdvsController.php | 6 +-- .../ads-list/partials/breadcrumb-mobile.twig | 2 +- 8 files changed, 81 insertions(+), 33 deletions(-) create mode 100644 addons/default/visiosoft/advs-module/resources/views/list/partials/mobile-list.twig diff --git a/addons/default/visiosoft/advs-module/resources/views/list/list.twig b/addons/default/visiosoft/advs-module/resources/views/list/list.twig index 8849f19cc..cb08f0329 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/list.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/list.twig @@ -7,7 +7,9 @@ {% block content %} -
+ {% include "visiosoft.module.advs::list/partials/mobile-list" %} + +
{% include "visiosoft.module.advs::list/partials/breadcrumb" %} @@ -15,7 +17,7 @@ {% include "visiosoft.module.advs::list/partials/list-filter" %} -
+

{{ trans('visiosoft.module.advs::field.search_ad_result_text', { @@ -65,7 +67,7 @@ {{ addBlock('ads-list/row',{'topfields':topfields,'selectRange':selectRange,'advs':advs, 'mainCats':mainCats|length})|raw }} -

+
{% block listContent %} {% include "visiosoft.module.advs::list/partials/ads" %} {% endblock %} diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/breadcrumb.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/breadcrumb.twig index 06e504837..141ae835f 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/breadcrumb.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/breadcrumb.twig @@ -1,6 +1,6 @@ -
+
- + {{ trans("visiosoft.module.advs::field.home") }} diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/filter-modal.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/filter-modal.twig index 77233b90a..d3a44f236 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/filter-modal.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/filter-modal.twig @@ -26,9 +26,9 @@ - {% if app.request.get('cat') %} + {% if category %} {% for category_breadcrumbs in mainCats %} - {{ category_breadcrumbs['val'] }} + {{ category_breadcrumbs['name'] }} {% if count(mainCats) != loop.index %} , {% endif %} diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig index 2b68a5e31..fa2e21698 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig @@ -3,7 +3,7 @@ {% set citySlug = pathInfo|length is same as(4) ? pathInfo[3] : null %} {% set formAction = catSlug ? url_route('adv_list_seo', [catSlug, citySlug]) : url_route('visiosoft.module.advs::list') %}
+ class="flex-shrink-0"> @@ -26,26 +26,26 @@ {% include 'visiosoft.module.cats::ads-list/partials/cat-filter' %}
- {{ addBlock('ads-list/partials/list-filter',{ - 'mainCats':mainCats, - 'subCats':subCats, - 'ranges':ranges, - 'text':text, - 'checkboxes':checkboxes, - 'topfields' : topfields, - 'selectDropdown' : selectDropdown, - 'selectRange' : selectRange, - 'selectImage' : selectImage, - 'radio':radio, - 'countries':countries, - 'cities':cities, - 'districts':districts, - 'neighborhoods':neighborhoods, - 'villages':villages, - 'param':param, - 'category':category, - 'cityId':cityId - })|raw }} + {{ addBlock('ads-list/partials/list-filter',{ + 'mainCats':mainCats, + 'subCats':subCats, + 'ranges':ranges, + 'text':text, + 'checkboxes':checkboxes, + 'topfields' : topfields, + 'selectDropdown' : selectDropdown, + 'selectRange' : selectRange, + 'selectImage' : selectImage, + 'radio':radio, + 'countries':countries, + 'cities':cities, + 'districts':districts, + 'neighborhoods':neighborhoods, + 'villages':villages, + 'param':param, + 'category':category, + 'cityId':cityId + })|raw }} {% include 'visiosoft.module.advs::list/partials/price-filter' %} diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/mobile-breadcrumb.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/mobile-breadcrumb.twig index a30f57ccd..e4e65f486 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/mobile-breadcrumb.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/mobile-breadcrumb.twig @@ -4,7 +4,7 @@ {{ trans("visiosoft.module.advs::field.home") }} - {{ addBlock('ads-list/partials/breadcrumb-mobile', {'mainCats': mainCats, 'category': categoryId})|raw }} + {{ addBlock('ads-list/partials/breadcrumb-mobile', {'mainCats': mainCats, 'category': category})|raw }}
diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/mobile-list.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/mobile-list.twig new file mode 100644 index 000000000..686b87377 --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/mobile-list.twig @@ -0,0 +1,46 @@ +
+ {% if setting_value('visiosoft.module.advs::show_subcats_mobile') %} + {% include "visiosoft.module.advs::list/partials/sub-categories-mobile" %} + {% endif %} + {% if not hideBreadcrump %} + {% include "visiosoft.module.advs::list/partials/mobile-breadcrumb" %} + {% endif %} + + {% if not hideActions %} +
+
+ {{ img('visiosoft.module.advs::images/listing/mobile-filter.svg').data|raw }} +

{{ trans('visiosoft.module.advs::field.filter') }}

+
+
+
+ {{ img('visiosoft.module.advs::images/listing/mobile-sort.svg').data|raw }} +

{{ trans('visiosoft.module.advs::field.sort') }}

+
+
+ + {{ addBlock('ads-list/mobile/action-bar')|raw }} + +
+ {% endif %} + +
+ {{ addBlock('ad-list/partials/mobile-list', {'featured_advs': featured_advs, 'vars': _context})|raw }} + + {% for adv in advs %} + + {{ adv.name }} +
+
{{ adv.name }}
+ {% if listLocation %} +

{{ adv.country_name }} / {{ adv.city_name }}

+ {% endif %} +

{{ adv.price != '0' ? currency_format(adv.price,adv.currency) : trans('visiosoft.module.advs::field.free') }}

+
+ + {% endfor %} +
+ + {% include "visiosoft.module.advs::list/partials/pagination" %} + +
diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php index 8df38c3b5..3723e1a67 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php @@ -271,7 +271,7 @@ class AdvsController extends PublicController if ($category) { - $mainCats = $this->category_repository->getParentCategoryByOrder($category->id); + $mainCats = collect($this->category_repository->getParentCategoryByOrder($category->id)); $subCats = $category->getSubCategories(); $allCats = false; } else { @@ -450,9 +450,9 @@ class AdvsController extends PublicController if ($city) { $catText = "$city->name $catText"; } elseif (count($mainCats) == 1 || count($mainCats) == 2) { - $catText = end($mainCats)->name; + $catText = $mainCats->last()->name; } elseif (count($mainCats) > 2) { - $catArray = array_slice($mainCats, 2); + $catArray = $mainCats->slice(2); $loop = 0; foreach ($catArray as $cat) { $catText = !$loop ? $catText . $cat->name : $catText . ' ' . $cat->name; diff --git a/addons/default/visiosoft/cats-module/resources/views/ads-list/partials/breadcrumb-mobile.twig b/addons/default/visiosoft/cats-module/resources/views/ads-list/partials/breadcrumb-mobile.twig index 3aa858edd..ca3b9a3ee 100644 --- a/addons/default/visiosoft/cats-module/resources/views/ads-list/partials/breadcrumb-mobile.twig +++ b/addons/default/visiosoft/cats-module/resources/views/ads-list/partials/breadcrumb-mobile.twig @@ -6,4 +6,4 @@ {% endfor %} -{% endif %} \ No newline at end of file +{% endif %} From 7dba9dd035cd59dad6a4ad347d93711b4e73ce1a Mon Sep 17 00:00:00 2001 From: Dia Date: Thu, 6 Jan 2022 17:48:33 +0300 Subject: [PATCH 2/2] #5090 [cat-module] Able to add same slug --- .../cats-module/resources/lang/en/message.php | 1 + .../Controller/Admin/CategoryController.php | 52 ++++++++++--------- 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/addons/default/visiosoft/cats-module/resources/lang/en/message.php b/addons/default/visiosoft/cats-module/resources/lang/en/message.php index 6c099c030..51acf5051 100644 --- a/addons/default/visiosoft/cats-module/resources/lang/en/message.php +++ b/addons/default/visiosoft/cats-module/resources/lang/en/message.php @@ -2,4 +2,5 @@ return [ 'categories_mass_delete_success' => 'Categories and related sub-categories has been deleted successfully!', + 'cat_slug_exists' => 'A category with a slug of :slug already exists!', ]; 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 5d75a7cb5..76d329fe3 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 @@ -63,8 +63,6 @@ class CategoryController extends AdminController public function create(FileUploader $uploader, FolderRepositoryInterface $folderRepository, MountManager $manager) { if ($this->request->action == "save") { - - $all = $this->request->all(); $id = $all['parent_category']; $parent_id = $all['parent_category']; @@ -119,24 +117,40 @@ class CategoryController extends AdminController } } if (empty($isMultiCat)) { - $category = $this->categoryRepository->create(array_merge($translatableEntries, [ - 'slug' => $all['slug'], - 'parent_category' => $all['parent_category'] === "" ? null : $all['parent_category'], - 'seo_keyword' => $all['seo_keyword'], - 'seo_description' => $all['seo_description'], + $slug = $all['slug']; + if (!$this->categoryRepository->findBySlug($slug)) { + $category = $this->categoryRepository->create(array_merge($translatableEntries, [ + 'slug' => $all['slug'], + 'parent_category' => $all['parent_category'] === "" ? null : $all['parent_category'], + 'seo_keyword' => $all['seo_keyword'], + 'seo_description' => $all['seo_description'], + ])); + + $this->createIconFile($category->getId()); + + $this->dispatch(new CalculateCategoryLevel($category->getId())); + } + + $this->messages->error(trans('visiosoft.module.cats::message.cat_slug_exists', [ + 'slug' => $slug ])); - - $this->createIconFile($category->getId()); - - $this->dispatch(new CalculateCategoryLevel($category->getId())); - } else { for ($i = 0; $i < count($isMultiCat[0]); $i++) { foreach ($isMultiCat as $cat) { $translatableEntries = array_merge($translatableEntries, $cat[$i]); } + + $slug = $this->str->slug(reset($translatableEntries)['name'], '_'); + if ($this->categoryRepository->findBySlug($slug)) { + $this->messages->error(trans('visiosoft.module.cats::message.cat_slug_exists', [ + 'slug' => $slug + ])); + + continue; + } + $category = $this->categoryRepository->create(array_merge($translatableEntries, [ - 'slug' => $this->str->slug(reset($translatableEntries)['name'], '_'), + 'slug' => $slug, 'parent_category' => $all['parent_category'] === "" ? null : $all['parent_category'], 'seo_keyword' => $all['seo_keyword'], 'seo_description' => $all['seo_description'], @@ -148,18 +162,6 @@ class CategoryController extends AdminController } }; -// $this->categoryRepository->create(array_merge($translatableEntries, [ -// 'slug' => $all['slug'], -// 'parent_category' => $all['parent_category'], -// 'icon' => $all['icon'], -// 'seo_keyword' => $all['seo_keyword'], -// 'seo_description' => $all['seo_description'], -// ])); - -// $form->make(); -// if ($form->hasFormErrors()) { -// return $this->redirect->to('/admin/cats/create'); -// } if ($parent_id != "") { return $this->redirect->to('/admin/cats?cat=' . $parent_id); }