From c0618e0afeb6d1901e0278b9ffa60ea791445f5b Mon Sep 17 00:00:00 2001 From: Metehan Celik Date: Wed, 29 Dec 2021 17:44:03 +0300 Subject: [PATCH 01/14] mobile view changed --- .../resources/views/list/gallery.twig | 15 +++++-- .../resources/views/list/list.twig | 2 +- .../base-theme/resources/css/gallery.css | 42 ++++++++++++++++++- 3 files changed, 54 insertions(+), 5 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig index 7494b9077..d9a71f092 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig @@ -11,7 +11,7 @@ {% for adv in advs %}
-
+
{{ addBlock('list/extra-actions', {'ad': adv, 'vars': _context}, ['favs', 'comparisons'])|raw }}
@@ -24,13 +24,22 @@ {% if not setting_value('visiosoft.module.advs::hide_ad_cat') %} {{ adv.cat1_name }} /{{ adv.cat2_name }} +

66 Değerlendirme +

{% endif %} {% if showPrice %} -
+
{{ adv.price != '0' ? currency_format(adv.price,adv.currency) : trans('visiosoft.module.advs::field.free') }}
- {% endif %} +

Bu ürünün farklı seçenekleri vardır.

+
+

+ 66 Değerlendirme +

+ +
+ {% endif %}
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..6ecfb207a 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/list.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/list.twig @@ -65,7 +65,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/base-theme/resources/css/gallery.css b/addons/default/visiosoft/base-theme/resources/css/gallery.css index 2d031b42f..19fe1397d 100644 --- a/addons/default/visiosoft/base-theme/resources/css/gallery.css +++ b/addons/default/visiosoft/base-theme/resources/css/gallery.css @@ -47,9 +47,49 @@ .product-price-hb { font-size: 24px; font-weight:bolder; - background-color: rgb(244,244,244); height: 50px; +} +@media screen and (max-width: 766px) { + .product-price-hb { + font-size: 24px; + font-weight:bolder; + height: 50px; + } + .product-info-hb>button{ + position: inherit !important; + width: 100%; + } + #listingWrapper{ + border:none !important; + } + .product-hb{ + border:none !important; + box-shadow: none !important; + } + .review{ + height: auto; + } + + .review>p{ + display: none; + } + + } .fs-14{ font-size: 14px; +} + +.product-price-hb~p{ + font-size:.7em; +} +.review{ + height: 32px; +} + +.gallery-card:hover>.product-info-hb>.review>button{ + display:block !important; +} +.gallery-card:hover>.product-info-hb>.review>p{ + display: none; } \ No newline at end of file From d142e55abdd3a1b4bc9ecae3144b9cf10d435a3f Mon Sep 17 00:00:00 2001 From: Metehan Celik Date: Thu, 30 Dec 2021 09:43:45 +0300 Subject: [PATCH 02/14] mobile view changed --- .../visiosoft/advs-module/resources/views/list/gallery.twig | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig index 93e143c46..c97769610 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig @@ -11,10 +11,7 @@ {% for adv in advs %}
-
-
- {{ addBlock('list/extra-actions', {'ad': adv, 'vars': _context}, ['favs', 'comparisons'])|raw }}
{{ adv.name }} @@ -31,8 +28,7 @@

{% endif %} {% if showPrice %} -
-
+
{{ adv.price != '0' ? currency_format(adv.price,adv.currency) : trans('visiosoft.module.advs::field.free') }} {{ addBlock('list/extra-actions', {'ad': adv, 'vars': _context}, ['comparisons'])|raw }}
From fca39b3e3bb1cb50b060d4ba717d93f0d7242884 Mon Sep 17 00:00:00 2001 From: Metehan Celik Date: Fri, 31 Dec 2021 10:02:58 +0300 Subject: [PATCH 03/14] mobile view changed --- .../visiosoft/advs-module/resources/views/list/gallery.twig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig index c97769610..b8f05d725 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig @@ -24,8 +24,10 @@ {% if not setting_value('visiosoft.module.advs::hide_ad_cat') %} {{ adv.cat1_name }} /{{ adv.cat2_name }} + {% endif %} {% if showPrice %}
@@ -34,9 +36,11 @@

Bu ürünün farklı seçenekleri vardır.

+
From bde46c8064dc4546355b0818beabc9ecfbfc9838 Mon Sep 17 00:00:00 2001 From: Metehan Celik Date: Wed, 5 Jan 2022 16:55:36 +0300 Subject: [PATCH 04/14] added if statement for banner. category cards have carousel now --- .../resources/views/list/gallery.twig | 27 +++++++++++++-- .../base-theme/resources/css/gallery.css | 34 +++++++++++++++++++ 2 files changed, 59 insertions(+), 2 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig index b72873280..75685f1c1 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig @@ -13,8 +13,16 @@
- - {{ adv.name }} + + {% for key,photo in adv.getViewPhotoUrl %} + + + {% endfor %} +
+ {% for key, photo in adv.getViewPhotoUrl %} +
+ {% endfor %} +
{{ addBlock('list/extra-actions', {'ad': adv, 'vars': _context}, ['favs'])|raw }}
@@ -36,6 +44,19 @@
{% endfor %}
+ {% endblock %} @@ -48,3 +69,5 @@ {{ asset_add("scripts.js", "visiosoft.module.advs::js/list-table.js") }} {% include "theme::scroll-modal" %} {% endblock %} + + diff --git a/addons/default/visiosoft/base-theme/resources/css/gallery.css b/addons/default/visiosoft/base-theme/resources/css/gallery.css index 2d031b42f..64d3d144b 100644 --- a/addons/default/visiosoft/base-theme/resources/css/gallery.css +++ b/addons/default/visiosoft/base-theme/resources/css/gallery.css @@ -52,4 +52,38 @@ } .fs-14{ font-size: 14px; +} +.imgs{ + position: relative; +} +.ads-img{ + position:inherit; +} +.imgs .ads-img { + width: 100%; + height: 100%; + display: none; +} +.imgs .ads-img:first-child { + display: flex; +} +.hover-area{ + position: absolute; + display: flex; + height: 100%; + width: 200px; + top: 0; + left: 0; +} +.hover-0 { + width: 33%; + height: 100%; +} +.hover-1 { + width: 33%; + height: 100%; +} +.hover-2 { + width: 33%; + height: 100%; } \ No newline at end of file From 2086961706c02c35cd0cdf20244e66a4e2d4739b Mon Sep 17 00:00:00 2001 From: Metehan Celik Date: Fri, 7 Jan 2022 23:02:42 +0300 Subject: [PATCH 05/14] gg theme minor changes --- .../defaultadmin-theme/resources/scss/theme/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/scss/theme/_variables.scss b/addons/default/visiosoft/defaultadmin-theme/resources/scss/theme/_variables.scss index 4d1a5f84a..7e2cf34c1 100644 --- a/addons/default/visiosoft/defaultadmin-theme/resources/scss/theme/_variables.scss +++ b/addons/default/visiosoft/defaultadmin-theme/resources/scss/theme/_variables.scss @@ -164,7 +164,7 @@ $grid-gutter-widths: ( // // Font, line-height, and color for body text, headings, and more. -$font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif !default; +$font-family-sans-serif: Roboto, "Helvetica Neue", Arial, sans-serif !default; $font-family-serif: Georgia, "Times New Roman", Times, serif !default; $font-family-monospace: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default; $font-family-base: $font-family-sans-serif !default; From 02ba890d3cd085d95baaf864743a9a459c45ef50 Mon Sep 17 00:00:00 2001 From: Metehan Celik Date: Mon, 10 Jan 2022 16:06:11 +0300 Subject: [PATCH 06/14] for loop limited, pages set again --- .../visiosoft/advs-module/resources/views/list/gallery.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig index 75685f1c1..7b21e20c3 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig @@ -14,7 +14,7 @@
- {% for key,photo in adv.getViewPhotoUrl %} + {% for key,photo in adv.getViewPhotoUrl|slice(0, 3) %} {% endfor %} From 31485e560f42d036d402f47be79b074dcb025c29 Mon Sep 17 00:00:00 2001 From: Metehan Celik Date: Mon, 10 Jan 2022 16:23:45 +0300 Subject: [PATCH 07/14] for loop limited, pages set again --- .../visiosoft/advs-module/resources/views/list/gallery.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig index 7b21e20c3..b2c9865be 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig @@ -19,7 +19,7 @@ {% endfor %}
- {% for key, photo in adv.getViewPhotoUrl %} + {% for key, photo in adv.getViewPhotoUrl|(0,3) %}
{% endfor %}
From c7f728cc531db68a3b59d90221aa825ebe16beef Mon Sep 17 00:00:00 2001 From: Metehan Celik Date: Wed, 12 Jan 2022 12:20:07 +0300 Subject: [PATCH 08/14] comment and static value deleted --- .../visiosoft/advs-module/resources/views/list/gallery.twig | 6 ------ 1 file changed, 6 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig index b8f05d725..7b50c6762 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig @@ -34,13 +34,7 @@ {{ adv.price != '0' ? currency_format(adv.price,adv.currency) : trans('visiosoft.module.advs::field.free') }} {{ addBlock('list/extra-actions', {'ad': adv, 'vars': _context}, ['comparisons'])|raw }}
-

Bu ürünün farklı seçenekleri vardır.

-
From b996ecdf3d64634d34b5a9463eaa9d02489e8c50 Mon Sep 17 00:00:00 2001 From: Metehan Celik Date: Wed, 12 Jan 2022 12:37:32 +0300 Subject: [PATCH 09/14] using trans now instead of static value --- .../visiosoft/advs-module/resources/lang/en/field.php | 1 + .../visiosoft/advs-module/resources/lang/tr/field.php | 1 + .../advs-module/resources/views/list/gallery.twig | 7 ++----- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/field.php b/addons/default/visiosoft/advs-module/resources/lang/en/field.php index aeb8d50cb..d14ca3df1 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/field.php @@ -156,6 +156,7 @@ return [ 'phone_gsm' => 'Gsm Phone', 'phone_office' => 'Office Phone', 'add_to_favorites' => "Add to Favorites", + 'add_to_cart'=> "Add to Cart", 'send' => 'Send', 'search_name' => 'Search Name', 'my_favorite_searches' => 'Favorite Searches', diff --git a/addons/default/visiosoft/advs-module/resources/lang/tr/field.php b/addons/default/visiosoft/advs-module/resources/lang/tr/field.php index 472f5e0ba..9a66cf182 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/tr/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/tr/field.php @@ -156,6 +156,7 @@ return [ 'phone_gsm' => 'Cep Telefonu', 'phone_office' => 'Sabit telefon', 'add_to_favorites' => "Favorilere Ekle", + 'add_to_cart'=> "Sepete Ekle", 'send' => 'Gönder', 'search_name' => 'Arama Adı', 'my_favorite_searches' => 'Favori Aramalar', diff --git a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig index 7b50c6762..90b66c79a 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig @@ -24,10 +24,7 @@ {% if not setting_value('visiosoft.module.advs::hide_ad_cat') %} {{ adv.cat1_name }} /{{ adv.cat2_name }} - + {% endif %} {% if showPrice %}
@@ -35,7 +32,7 @@ {{ addBlock('list/extra-actions', {'ad': adv, 'vars': _context}, ['comparisons'])|raw }}
- +
{% endif %} From 923b08ff672bbadb509ebed430e2d2c9ad3f8118 Mon Sep 17 00:00:00 2001 From: Metehan Celik Date: Wed, 12 Jan 2022 15:51:25 +0300 Subject: [PATCH 10/14] admin-theme reverted. scripts moved. one necessary variable assigned. --- .../advs-module/resources/js/list-table.js | 12 ++++++++++- .../resources/views/list/gallery.twig | 20 +++++-------------- .../resources/scss/theme/_variables.scss | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/js/list-table.js b/addons/default/visiosoft/advs-module/resources/js/list-table.js index e6cb27468..beba35ca4 100644 --- a/addons/default/visiosoft/advs-module/resources/js/list-table.js +++ b/addons/default/visiosoft/advs-module/resources/js/list-table.js @@ -1,3 +1,13 @@ $(".clickable-row").click(function () { window.location = $(this).data("href"); -}); \ No newline at end of file +}); + +$('.hover-area').mouseover((e) => { + var el = $(e); + + var img = $(`.${$(el[0].target).data('id')}`); + + img.siblings('img').hide(); + + img.show(); +}); diff --git a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig index b2c9865be..d93d3f898 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig @@ -14,12 +14,14 @@
- {% for key,photo in adv.getViewPhotoUrl|slice(0, 3) %} + {% set slicedPhotos = adv.getViewPhotoUrl|slice(0,3) %} + + {% for key,photo in slicedPhotos %} {% endfor %}
- {% for key, photo in adv.getViewPhotoUrl|(0,3) %} + {% for key, photo in slicedPhotos %}
{% endfor %}
@@ -44,19 +46,8 @@
{% endfor %}
- + {{ asset_add("scripts.js", "visiosoft.module.advs::js/list-table.js") }} {% endblock %} @@ -66,7 +57,6 @@ {% endblock %} {% block customjs %} - {{ asset_add("scripts.js", "visiosoft.module.advs::js/list-table.js") }} {% include "theme::scroll-modal" %} {% endblock %} diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/scss/theme/_variables.scss b/addons/default/visiosoft/defaultadmin-theme/resources/scss/theme/_variables.scss index 7e2cf34c1..4d1a5f84a 100644 --- a/addons/default/visiosoft/defaultadmin-theme/resources/scss/theme/_variables.scss +++ b/addons/default/visiosoft/defaultadmin-theme/resources/scss/theme/_variables.scss @@ -164,7 +164,7 @@ $grid-gutter-widths: ( // // Font, line-height, and color for body text, headings, and more. -$font-family-sans-serif: Roboto, "Helvetica Neue", Arial, sans-serif !default; +$font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif !default; $font-family-serif: Georgia, "Times New Roman", Times, serif !default; $font-family-monospace: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default; $font-family-base: $font-family-sans-serif !default; From b6ed7e78e65ae0b0a948f4a774fcd353ae67e49a Mon Sep 17 00:00:00 2001 From: Metehan Celik Date: Wed, 12 Jan 2022 16:33:03 +0300 Subject: [PATCH 11/14] add-to-cart button removed according to fatihalp's comment --- .../visiosoft/advs-module/resources/views/list/gallery.twig | 3 --- 1 file changed, 3 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig index 90b66c79a..d5a95ce9d 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig @@ -31,9 +31,6 @@ {{ adv.price != '0' ? currency_format(adv.price,adv.currency) : trans('visiosoft.module.advs::field.free') }} {{ addBlock('list/extra-actions', {'ad': adv, 'vars': _context}, ['comparisons'])|raw }}
-
- -
{% endif %}
From 5ee0de7bb7b9044cf9624b39cac676c29e37a605 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Thu, 13 Jan 2022 09:55:19 +0300 Subject: [PATCH 12/14] fix name object problem --- .../src/Http/Controller/Admin/AdressController.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/default/visiosoft/profile-module/src/Http/Controller/Admin/AdressController.php b/addons/default/visiosoft/profile-module/src/Http/Controller/Admin/AdressController.php index df81d0cb1..ba265c7ab 100644 --- a/addons/default/visiosoft/profile-module/src/Http/Controller/Admin/AdressController.php +++ b/addons/default/visiosoft/profile-module/src/Http/Controller/Admin/AdressController.php @@ -15,7 +15,8 @@ class AdressController extends AdminController $table->setColumns(array_merge($table->getColumns(), [ 'city' => [ 'value' => function (EntryInterface $entry, CityRepositoryInterface $cityRepository) { - return $cityRepository->find($entry->city)->name; + $city = $cityRepository->find($entry->city); + return ($city) ? $city->name : '-'; }, ], ])); @@ -37,11 +38,11 @@ class AdressController extends AdminController return $form->render($id); } - public function adressUpdate(AdressFormBuilder $form,Request $request,$id) + public function adressUpdate(AdressFormBuilder $form, Request $request, $id) { $error = $form->build()->validate()->getFormErrors()->getMessages(); - if(!empty($error)) { + if (!empty($error)) { return $this->redirect->back(); } From a0892306d730da764e0f028aa6475e94cfa1ffad Mon Sep 17 00:00:00 2001 From: Metehan Celik Date: Fri, 14 Jan 2022 10:39:19 +0300 Subject: [PATCH 13/14] gallery-view fixes final solution --- addons/default/visiosoft/base-theme/resources/css/gallery.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/default/visiosoft/base-theme/resources/css/gallery.css b/addons/default/visiosoft/base-theme/resources/css/gallery.css index f5686ba36..038e7bc43 100644 --- a/addons/default/visiosoft/base-theme/resources/css/gallery.css +++ b/addons/default/visiosoft/base-theme/resources/css/gallery.css @@ -91,9 +91,9 @@ .gallery-card:hover>.product-info-hb>.review>button{ display:block !important; } -.gallery-card:hover>.product-info-hb>.review>p{ +.gallery-card:hover>.product-info-hb>.review>p { display: none; - +} .imgs{ position: relative; } From 876283462db4d903e682c48225b8ccda605f8991 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Tue, 18 Jan 2022 13:06:06 +0300 Subject: [PATCH 14/14] add set main category button --- .../cats-module/resources/lang/en/button.php | 1 + .../cats-module/resources/lang/tr/button.php | 1 + .../src/Category/Table/CategoryTableButtons.php | 15 ++++++++++++--- .../cats-module/src/CatsModuleServiceProvider.php | 1 + .../Http/Controller/Admin/CategoryController.php | 12 +++++++++++- 5 files changed, 26 insertions(+), 4 deletions(-) diff --git a/addons/default/visiosoft/cats-module/resources/lang/en/button.php b/addons/default/visiosoft/cats-module/resources/lang/en/button.php index bf027d9ac..0388476ea 100644 --- a/addons/default/visiosoft/cats-module/resources/lang/en/button.php +++ b/addons/default/visiosoft/cats-module/resources/lang/en/button.php @@ -5,4 +5,5 @@ return [ 'add_sub_category' => 'Add Sub Category', 'sub_category' => 'Show Sub Category', 'new_placeholderforsearch' => 'New Placeholderforsearch', + 'convert_main' => 'Convert Main Category', ]; diff --git a/addons/default/visiosoft/cats-module/resources/lang/tr/button.php b/addons/default/visiosoft/cats-module/resources/lang/tr/button.php index ea0bb9b2b..eb54ff497 100644 --- a/addons/default/visiosoft/cats-module/resources/lang/tr/button.php +++ b/addons/default/visiosoft/cats-module/resources/lang/tr/button.php @@ -5,4 +5,5 @@ return [ 'add_sub_category' => 'Alt Kategori Ekle', 'sub_category' => 'Alt Kategoriyi Göster', 'new_placeholderforsearch' => 'Arama için Yeni Yer Tutucu', + 'convert_main' => 'Ana Kategori Yap', ]; diff --git a/addons/default/visiosoft/cats-module/src/Category/Table/CategoryTableButtons.php b/addons/default/visiosoft/cats-module/src/Category/Table/CategoryTableButtons.php index 4bdc6f1a5..72c9b85c4 100644 --- a/addons/default/visiosoft/cats-module/src/Category/Table/CategoryTableButtons.php +++ b/addons/default/visiosoft/cats-module/src/Category/Table/CategoryTableButtons.php @@ -21,12 +21,21 @@ class CategoryTableButtons 'type' => 'success', 'href' => '/admin/cats?cat={entry.id}' ], + 'convert_main' => [ + 'icon' => 'refresh', + 'class' => function () { + if (!request('cat')) { + return 'hidden'; + } + }, + 'type' => 'info', + 'href' => '/admin/cats/convert-main/{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; + 'href' => function (EntryInterface $entry) { + return route('visiosoft.module.cats::admin.delete_category', ['id' => $entry->getId()]) . "?parent=" . $entry->parent_category_id; } ] ]); diff --git a/addons/default/visiosoft/cats-module/src/CatsModuleServiceProvider.php b/addons/default/visiosoft/cats-module/src/CatsModuleServiceProvider.php index fa5d356b3..fde6e60b2 100644 --- a/addons/default/visiosoft/cats-module/src/CatsModuleServiceProvider.php +++ b/addons/default/visiosoft/cats-module/src/CatsModuleServiceProvider.php @@ -40,6 +40,7 @@ class CatsModuleServiceProvider extends AddonServiceProvider 'as' => 'visiosoft.module.cats::import', 'uses' => 'Visiosoft\CatsModule\Http\Controller\Admin\CategoryController@import', ], + 'admin/cats/convert-main/{id}' => 'Visiosoft\CatsModule\Http\Controller\Admin\CategoryController@convertMain', 'admin/cats/export' => [ 'as' => 'visiosoft.module.cats::export', 'uses' => 'Visiosoft\CatsModule\Http\Controller\Admin\CategoryController@export', 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 76d329fe3..6e44cd6ed 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 @@ -273,7 +273,7 @@ class CategoryController extends AdminController $file = $uploader->upload($file, $folder); - $url = route('anomaly.module.files::files.view',['folder' => $folder->slug,'name' => $file->name]); + $url = route('anomaly.module.files::files.view', ['folder' => $folder->slug, 'name' => $file->name]); $category->setCategoryIconUrl($url); } catch (\Exception $exception) { @@ -338,4 +338,14 @@ class CategoryController extends AdminController ]; } } + + public function convertMain($id) + { + if ($category = $this->categoryRepository->find($id)) { + $category->update(['parent_category_id' => null]); + + $this->messages->success(trans('streams::message.edit_success', ['name' => trans('visiosoft.module.cats::addon.title')])); + return redirect('admin/cats'); + } + } }