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/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 b72873280..34c474bdf 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,18 @@
+
{% 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..038e7bc43 100644
--- a/addons/default/visiosoft/base-theme/resources/css/gallery.css
+++ b/addons/default/visiosoft/base-theme/resources/css/gallery.css
@@ -47,9 +47,84 @@
.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;
+}
+.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
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 7338618a4..efc7daedb 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
@@ -276,7 +276,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) {
@@ -341,4 +341,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');
+ }
+ }
}
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();
}