From 3d825471bc6661a884e597fd9e083a92b629ca58 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Wed, 13 Nov 2019 11:37:34 +0300 Subject: [PATCH 01/24] #137 Show ad cover photo, Fixed cover photo not showing if it was saved localy. --- .../src/Http/Controller/Admin/AdvsController.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php index d9c9ca9d4..72e6dc6eb 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php @@ -83,8 +83,14 @@ class AdvsController extends AdminController $table->setColumns([ 'cover_photo' => [ - 'wrapper' => '', - 'value' => ['cover_photo' => 'entry.cover_photo'] + 'wrapper' => function (EntryInterface $entry, Request $request) { + if (strpos($entry->cover_photo, 'http') === 0) { + $wrapper = ''; + } else { + $wrapper = ''; + } + return $wrapper; + }, ], 'entry.id', 'name' => [ From 63d1e5601ad7ba1353ad2bca75896d13cedd87dd Mon Sep 17 00:00:00 2001 From: Diatrex Date: Wed, 13 Nov 2019 17:13:50 +0300 Subject: [PATCH 02/24] #137 Show ad cover photo, Fixed cover photo not showing if it was saved localy. --- addons/default/visiosoft/demodata-module | 1 + 1 file changed, 1 insertion(+) create mode 160000 addons/default/visiosoft/demodata-module diff --git a/addons/default/visiosoft/demodata-module b/addons/default/visiosoft/demodata-module new file mode 160000 index 000000000..76c01b40d --- /dev/null +++ b/addons/default/visiosoft/demodata-module @@ -0,0 +1 @@ +Subproject commit 76c01b40d52214827ab4a683a349797686d16c70 From 6e9edf499df9e2be6179f5603e3528ac3e1c59b6 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Wed, 13 Nov 2019 17:29:46 +0300 Subject: [PATCH 03/24] #144 remove the seeder/data from project --- .../advs-module/src/AdvsModuleSeeder.php | 47 ------------------- .../Http/Controller/Admin/AdvsController.php | 2 +- .../cats-module/src/CatsModuleSeeder.php | 21 +-------- 3 files changed, 2 insertions(+), 68 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/AdvsModuleSeeder.php b/addons/default/visiosoft/advs-module/src/AdvsModuleSeeder.php index c6bb53f1a..eba3670b2 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModuleSeeder.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModuleSeeder.php @@ -1,63 +1,16 @@ disks = $disks; - $this->folders = $folders; - } - /** * Run the seeder. */ public function run() { - //Download demo SQL - $repository = "https://raw.githubusercontent.com/openclassify/Openclassify-Demo-Data/master/"; - file_put_contents(__DIR__."/demo.sql", fopen($repository."demo.sql", 'r')); - //Download demo Files and Extract to Files - file_put_contents("advs-files.zip", fopen($repository."advs-files.zip", 'r')); - $zipper = new Zipper(); - $zipper->make('advs-files.zip')->folder('advs-files')->extractTo(base_path().'/public/app/default/files-module/local/images/'); - $zipper->close(); - $this->call(BlockSeeder::class); - - /* Demo Start */ - DB::table('files_files')->truncate(); - Model::unguard(); - DB::unprepared(file_get_contents(__DIR__.'/demo.sql')); - Model::reguard(); - /* Demo Stop*/ } } \ No newline at end of file diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php index 72e6dc6eb..b11bf6342 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php @@ -87,7 +87,7 @@ class AdvsController extends AdminController if (strpos($entry->cover_photo, 'http') === 0) { $wrapper = ''; } else { - $wrapper = ''; + $wrapper = ''; } return $wrapper; }, diff --git a/addons/default/visiosoft/cats-module/src/CatsModuleSeeder.php b/addons/default/visiosoft/cats-module/src/CatsModuleSeeder.php index e96b19902..671d997f4 100644 --- a/addons/default/visiosoft/cats-module/src/CatsModuleSeeder.php +++ b/addons/default/visiosoft/cats-module/src/CatsModuleSeeder.php @@ -1,9 +1,6 @@ call(CategorySeeder::class); - - //Download demo SQL - $repository = "https://raw.githubusercontent.com/openclassify/Openclassify-Demo-Data/master/"; - file_put_contents(__DIR__."/categories.sql", fopen($repository."categories.sql", 'r')); - file_put_contents(__DIR__."/categoryTransEn.sql", fopen($repository."categoryTransEn.sql", 'r')); - //Download demo Files and Extract to Files - file_put_contents("category-files.zip", fopen($repository."category-files.zip", 'r')); - $zipper = new Zipper(); - $zipper->make('category-files.zip')->folder('category-files')->extractTo(base_path().'/public/app/default/files-module/local/images/'); - $zipper->close(); - $this->call(PlaceholderforsearchSeeder::class); - Model::unguard(); - DB::unprepared(file_get_contents(__DIR__.'/categories.sql')); - DB::unprepared(file_get_contents(__DIR__.'/categoryTransEn.sql')); - Model::reguard(); } } \ No newline at end of file From 7714ca1dff6cb2349d326b9d93afb311f0654915 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Wed, 13 Nov 2019 18:19:23 +0300 Subject: [PATCH 04/24] Revert "#137 Show ad cover photo, Fixed cover photo not showing if it was saved localy." This reverts commit 63d1e560 --- addons/default/visiosoft/demodata-module | 1 - 1 file changed, 1 deletion(-) delete mode 160000 addons/default/visiosoft/demodata-module diff --git a/addons/default/visiosoft/demodata-module b/addons/default/visiosoft/demodata-module deleted file mode 160000 index 76c01b40d..000000000 --- a/addons/default/visiosoft/demodata-module +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 76c01b40d52214827ab4a683a349797686d16c70 From f499c4bdca5da8fe6e0e9c94115d3212a8514407 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Thu, 14 Nov 2019 13:52:34 +0300 Subject: [PATCH 05/24] #1 Adding and fixing the demo ad images --- addons/default/visiosoft/demodata-module | 1 + 1 file changed, 1 insertion(+) create mode 160000 addons/default/visiosoft/demodata-module diff --git a/addons/default/visiosoft/demodata-module b/addons/default/visiosoft/demodata-module new file mode 160000 index 000000000..e87cf9caa --- /dev/null +++ b/addons/default/visiosoft/demodata-module @@ -0,0 +1 @@ +Subproject commit e87cf9caa2e9fc7ebb35e650bd8cb17a1655aac1 From 19e76d4111a64558e28b91979a128ec771af6bb8 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Fri, 15 Nov 2019 10:58:25 +0300 Subject: [PATCH 06/24] #1 Adding and fixing the demo ad images (make it local) --- addons/default/visiosoft/advs-module/src/Adv/AdvModel.php | 2 +- .../visiosoft/base-theme/resources/config/settings.php | 4 ++-- .../visiosoft/base-theme/resources/views/indexes/index.twig | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php index b7ef273b1..e5013174b 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php @@ -152,7 +152,7 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface public function popularAdvs() { - return $this->getAdv()->where('popular_adv', 1)->paginate(9); + return $this->getAdv()->where('popular_adv', 1)->paginate(2); } public function advsofDay() diff --git a/addons/default/visiosoft/base-theme/resources/config/settings.php b/addons/default/visiosoft/base-theme/resources/config/settings.php index 16337de40..e2a4ce117 100644 --- a/addons/default/visiosoft/base-theme/resources/config/settings.php +++ b/addons/default/visiosoft/base-theme/resources/config/settings.php @@ -21,8 +21,8 @@ return [ 's-type-latest-limit' => [ 'type' => 'anomaly.field_type.integer', 'config' => [ - 'default_value' => 36, - 'min' => 12, + 'default_value' => 5, + 'min' => 5, ], ], 's-type-showcase-limit' => [ diff --git a/addons/default/visiosoft/base-theme/resources/views/indexes/index.twig b/addons/default/visiosoft/base-theme/resources/views/indexes/index.twig index 05122ecf7..2254d863c 100644 --- a/addons/default/visiosoft/base-theme/resources/views/indexes/index.twig +++ b/addons/default/visiosoft/base-theme/resources/views/indexes/index.twig @@ -246,6 +246,7 @@ {% endfor %} + {{ latest_advs.links | raw }} @@ -314,6 +315,7 @@ {% endfor %} + {{ popular_advs.links | raw }} From 10304f1800f2b1e2f240d0cb59b12f2acb16f3d0 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Fri, 15 Nov 2019 12:24:30 +0300 Subject: [PATCH 07/24] fixed layout problems --- .../default/visiosoft/advs-module/resources/views/list/map.twig | 1 - .../visiosoft/advs-module/resources/views/list/table.twig | 1 - 2 files changed, 2 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/map.twig b/addons/default/visiosoft/advs-module/resources/views/list/map.twig index 30106d2c6..c5fa80185 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/map.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/map.twig @@ -1,4 +1,3 @@ -{% extends layout('map') %} {% extends "visiosoft.module.advs::list/list" %} {% block listContent %}
diff --git a/addons/default/visiosoft/advs-module/resources/views/list/table.twig b/addons/default/visiosoft/advs-module/resources/views/list/table.twig index bf46b44db..de7f97e0f 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/table.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/table.twig @@ -1,4 +1,3 @@ -{% extends layout('table') %} {% extends "visiosoft.module.advs::list/list" %} {% block listContent %} From cfe409901ccb36662cf09946d8682f488a796fe0 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Fri, 15 Nov 2019 15:44:23 +0300 Subject: [PATCH 08/24] #1 Adding and fixing the demo ad images (make it local) --- addons/default/visiosoft/advs-module/src/Adv/AdvModel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php index e5013174b..cf8394d33 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php @@ -152,7 +152,7 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface public function popularAdvs() { - return $this->getAdv()->where('popular_adv', 1)->paginate(2); + return $this->getAdv()->orderBy('count_show_ad', 'desc')->limit(10)->get(); } public function advsofDay() From b27bbe08f0562ef1424e4922845696e67b605c6d Mon Sep 17 00:00:00 2001 From: alp Date: Fri, 15 Nov 2019 18:39:15 +0300 Subject: [PATCH 09/24] delete demo data --- addons/default/visiosoft/demodata-module | 1 - 1 file changed, 1 deletion(-) delete mode 160000 addons/default/visiosoft/demodata-module diff --git a/addons/default/visiosoft/demodata-module b/addons/default/visiosoft/demodata-module deleted file mode 160000 index e87cf9caa..000000000 --- a/addons/default/visiosoft/demodata-module +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e87cf9caa2e9fc7ebb35e650bd8cb17a1655aac1 From dc614bc1a0a69fc743dbbad6cfcbce2975f05b7c Mon Sep 17 00:00:00 2001 From: alp Date: Mon, 18 Nov 2019 11:55:28 +0300 Subject: [PATCH 10/24] Fix translation --- .../advs-module/resources/views/list/partials/list-filter.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7a5a493ae..3e2cf2f52 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 @@ -49,7 +49,7 @@

- {{ trans('visiosoft.module.advs::fields.price.name') }} + {{ trans('visiosoft.module.advs::field.price.name') }}

From 7214eca9a950337c645702baeb4891086ec82bfe Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 18 Nov 2019 17:59:18 +0300 Subject: [PATCH 11/24] #1 fix images not shown in openclassify --- addons/default/visiosoft/demodata-module | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/demodata-module b/addons/default/visiosoft/demodata-module index e87cf9caa..67f186905 160000 --- a/addons/default/visiosoft/demodata-module +++ b/addons/default/visiosoft/demodata-module @@ -1 +1 @@ -Subproject commit e87cf9caa2e9fc7ebb35e650bd8cb17a1655aac1 +Subproject commit 67f1869058f2a06a66d221a1795b5a2db49c2735 From abe87ea262895e469447225937920a23b252bfec Mon Sep 17 00:00:00 2001 From: Diatrex Date: Tue, 19 Nov 2019 17:09:18 +0300 Subject: [PATCH 12/24] Default country in listing #152 --- .../advs-module/resources/views/list/list.twig | 3 ++- .../src/Http/Controller/advsController.php | 9 ++++++++- .../base-theme/resources/js/filterLocation.js | 11 ++++++++++- 3 files changed, 20 insertions(+), 3 deletions(-) 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 108a024c1..ca4a48cca 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/list.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/list.twig @@ -35,13 +35,14 @@
{% endblock %} -
{% if entries('advs').isEnabled('favs') %} 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 ba76e11fc..370ae9f40 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -146,6 +146,13 @@ class AdvsController extends PublicController $subCats = array(); $param = $this->requestHttp->toArray(); + if (!isset($param['country'])) { + $param['country'] = setting_value('visiosoft.module.advs::default_country'); + $useDefault = 1; + } else { + $useDefault = 0; + } + $searchedCountry = $param['country']; $countries = $this->country_repository->viewAll(); @@ -213,7 +220,7 @@ class AdvsController extends PublicController } $compact = compact('advs', 'countries', 'mainCats', 'subCats', 'textfields', 'checkboxes', 'request', - 'user', 'userProfile', 'featured_advs', 'type', 'topfields', 'ranges', 'seenList'); + 'user', 'userProfile', 'featured_advs', 'type', 'topfields', 'ranges', 'seenList', 'searchedCountry', 'useDefault'); Cookie::queue(Cookie::make('last_search', $this->requestHttp->getRequestUri(), 84000)); diff --git a/addons/default/visiosoft/base-theme/resources/js/filterLocation.js b/addons/default/visiosoft/base-theme/resources/js/filterLocation.js index d0945e473..dd77002f6 100644 --- a/addons/default/visiosoft/base-theme/resources/js/filterLocation.js +++ b/addons/default/visiosoft/base-theme/resources/js/filterLocation.js @@ -25,6 +25,15 @@ FindLocations = (id, table, typeDb, divId, paramName = null) => { }); }; +// Set selected country in the select menu +if (useDefault) { + $('#cities').empty(); + var table = "cities"; + var typeDb = 'parent_country_id'; + var id = searchedCountry; + var divId = "#cities"; + FindLocations(id, table, typeDb, divId); +} setLocations = (response, id, table, typeDb, divId, paramName) => { @@ -40,7 +49,7 @@ setLocations = (response, id, table, typeDb, divId, paramName) => { //Set Selected Option if (paramName != null) { if (divId == "#cities") { - $('#countries').val(searchParams.get('country')); + $('#countries').val(searchedCountry); $('#countries').select2(); $('#cities').val(findParam("city[]")); } else { From cdd7f8185702153f4cca4ab937cb7a39b03aea24 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Tue, 19 Nov 2019 17:26:31 +0300 Subject: [PATCH 13/24] Revert "#1 fix images not shown in openclassify" This reverts commit 7214eca9a950337c645702baeb4891086ec82bfe. # Conflicts: # addons/default/visiosoft/demodata-module --- addons/default/visiosoft/demodata-module | 1 - 1 file changed, 1 deletion(-) delete mode 160000 addons/default/visiosoft/demodata-module diff --git a/addons/default/visiosoft/demodata-module b/addons/default/visiosoft/demodata-module deleted file mode 160000 index 026073c7e..000000000 --- a/addons/default/visiosoft/demodata-module +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 026073c7ec0447fa505f0534df649f805d4c70f3 From e3cf2a68be4ee317c064f20297905398f76cb697 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Tue, 19 Nov 2019 18:03:45 +0300 Subject: [PATCH 14/24] Default country in listing #152 #153 --- .../advs-module/resources/views/list/list.twig | 1 - .../src/Http/Controller/advsController.php | 13 +++++++++---- .../base-theme/resources/js/filterLocation.js | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) 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 ca4a48cca..f7dc858c0 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/list.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/list.twig @@ -42,7 +42,6 @@ {% if entries('advs').isEnabled('favs') %} 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 370ae9f40..f5ed48863 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -147,10 +147,15 @@ class AdvsController extends PublicController $param = $this->requestHttp->toArray(); if (!isset($param['country'])) { - $param['country'] = setting_value('visiosoft.module.advs::default_country'); - $useDefault = 1; + if (is_null(Cookie::get('country'))) { + $param['country'] = setting_value('visiosoft.module.advs::default_country'); + } else { + $param['country'] = Cookie::get('country'); + } } else { - $useDefault = 0; + if ($param['country'] != setting_value('visiosoft.module.advs::default_country')) { + Cookie::queue(Cookie::make('country', $param['country'], 84000)); + } } $searchedCountry = $param['country']; @@ -220,7 +225,7 @@ class AdvsController extends PublicController } $compact = compact('advs', 'countries', 'mainCats', 'subCats', 'textfields', 'checkboxes', 'request', - 'user', 'userProfile', 'featured_advs', 'type', 'topfields', 'ranges', 'seenList', 'searchedCountry', 'useDefault'); + 'user', 'userProfile', 'featured_advs', 'type', 'topfields', 'ranges', 'seenList', 'searchedCountry'); Cookie::queue(Cookie::make('last_search', $this->requestHttp->getRequestUri(), 84000)); diff --git a/addons/default/visiosoft/base-theme/resources/js/filterLocation.js b/addons/default/visiosoft/base-theme/resources/js/filterLocation.js index dd77002f6..32bcb033b 100644 --- a/addons/default/visiosoft/base-theme/resources/js/filterLocation.js +++ b/addons/default/visiosoft/base-theme/resources/js/filterLocation.js @@ -26,7 +26,7 @@ FindLocations = (id, table, typeDb, divId, paramName = null) => { }; // Set selected country in the select menu -if (useDefault) { +if (searchParams.get('country') == null) { $('#cities').empty(); var table = "cities"; var typeDb = 'parent_country_id'; From b5a7634fdfac126c342d5fb25a1de412748b9bd2 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Wed, 20 Nov 2019 12:50:07 +0300 Subject: [PATCH 15/24] Default country in listing #152 #153 --- .../visiosoft/advs-module/src/Adv/AdvModel.php | 6 +++--- .../advs-module/src/AdvsModuleServiceProvider.php | 14 +++++++++++--- .../src/Http/Controller/CategoriesController.php | 14 +++++++++++++- .../src/Http/Controller/advsController.php | 4 +++- 4 files changed, 30 insertions(+), 8 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php index cf8394d33..419f54151 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php @@ -228,12 +228,12 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface $id = $object->id; $seo = str_slug($object->name); $seo = str_replace('_', '-', $seo); - return \route('adv_detail_seo', [$id, $seo]); + return \route('adv_detail_seo', [$seo, $id]); } $id = $object->getObject()->id; $seo = str_slug($object->getObject()->name); $seo = str_replace('_', '-', $seo); - return \route('adv_detail_seo', [$id, $seo]); + return \route('adv_detail_seo', [$seo, $id]); } public function getAdvDetailLinkByAdId($id) @@ -243,7 +243,7 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface $id = $adv->id; $seo = str_slug($adv->name); $seo = str_replace('_', '-', $seo); - return \route('adv_detail_seo', [$id, $seo]); + return \route('adv_detail_seo', [$seo, $id]); } } diff --git a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php index b97412b8c..15f86fd76 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php @@ -110,11 +110,19 @@ class AdvsModuleServiceProvider extends AddonServiceProvider ], 'getlocations' => 'Visiosoft\AdvsModule\Http\Controller\advsController@getLocations', 'advs/main' => 'Visiosoft\AdvsModule\Http\Controller\advsController@advsMainPage', - 'advs/adv/{id}' => [ +// 'advs/adv/{id}' => [ +// 'as' => 'adv_detail', +// 'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@view' +// ], +// 'advs/adv/{id}/{seo}' => [ +// 'as' => 'adv_detail_seo', +// 'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@view' +// ], + 'ad/{id}' => [ 'as' => 'adv_detail', 'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@view' ], - 'advs/adv/{id}/{seo}' => [ + 'ad/{seo}/{id}' => [ 'as' => 'adv_detail_seo', 'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@view' ], @@ -123,7 +131,7 @@ class AdvsModuleServiceProvider extends AddonServiceProvider 'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@map' ], 'advs/categories' => 'Visiosoft\AdvsModule\Http\Controller\CategoriesController@index', - 'advs/categories/{cat}' => 'Visiosoft\AdvsModule\Http\Controller\CategoriesController@listByCat', + 'advs/c/{cat}' => 'Visiosoft\AdvsModule\Http\Controller\CategoriesController@listByCat', 'advs/module_active' => 'Visiosoft\AdvsModule\Http\Controller\advsController@index', 'advs/create_adv' => [ 'as' => "create_adv", diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/CategoriesController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/CategoriesController.php index 3329bb931..05d8fba37 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/CategoriesController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/CategoriesController.php @@ -8,12 +8,24 @@ class CategoriesController extends PublicController { public function listByCat($cat) { $advs = DB::table('advs_advs') - ->where('category_id', $cat) + ->where('cat1', $cat) + ->orwhere('cat2', $cat) + ->orwhere('cat3', $cat) + ->orwhere('cat4', $cat) + ->orwhere('cat5', $cat) + ->orwhere('cat6', $cat) + ->orwhere('cat7', $cat) ->leftJoin('users_users as u1', 'advs_advs.created_by_id', '=', 'u1.id') ->leftJoin('advs_advs_translations as t1', 'advs_advs.id', '=', 't1.id') ->select('advs_advs.*','u1.username as owner', 't1.name as name') ->get(); + foreach ($advs as $adv) { + if (strpos($adv->cover_photo, 'http') !== 0 && strpos($adv->cover_photo, '/') !== 0) { + $adv->cover_photo = "/$adv->cover_photo"; + } + } + return $this->view->make('visiosoft.module.advs::list/list', compact('advs')); } } 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 f5ed48863..61dad7c5c 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -245,8 +245,10 @@ class AdvsController extends PublicController return redirect($this->request->headers->get('referer')); } - public function view($id) + public function view($seo, $id = null) { + $id = is_null($id) ? $seo : $id; + $categories = array(); $categories_id = array(); $isActiveComplaints = $this->adv_model->is_enabled('complaints'); From 533609d471145919263e34180d36fd0086fdb6ca Mon Sep 17 00:00:00 2001 From: Diatrex Date: Wed, 20 Nov 2019 18:41:41 +0300 Subject: [PATCH 16/24] remove comment from link service provider --- .../src/AdvsModuleServiceProvider.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php index 15f86fd76..029663d5e 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php @@ -110,14 +110,14 @@ class AdvsModuleServiceProvider extends AddonServiceProvider ], 'getlocations' => 'Visiosoft\AdvsModule\Http\Controller\advsController@getLocations', 'advs/main' => 'Visiosoft\AdvsModule\Http\Controller\advsController@advsMainPage', -// 'advs/adv/{id}' => [ -// 'as' => 'adv_detail', -// 'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@view' -// ], -// 'advs/adv/{id}/{seo}' => [ -// 'as' => 'adv_detail_seo', -// 'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@view' -// ], + 'advs/adv/{id}' => [ + 'as' => 'adv_detail', + 'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@view' + ], + 'advs/adv/{id}/{seo}' => [ + 'as' => 'adv_detail_seo', + 'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@view' + ], 'ad/{id}' => [ 'as' => 'adv_detail', 'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@view' From 7c244ba62db7b5fd34a8a5c2659a5c58add72044 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Thu, 21 Nov 2019 17:39:03 +0300 Subject: [PATCH 17/24] =?UTF-8?q?#504=20Arap=C3=A7a=20(AR)=20=C3=A7evirile?= =?UTF-8?q?r=20eklenecek?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base-theme/resources/lang/ar/addon.php | 50 +++++++++++++++++++ .../base-theme/resources/lang/ar/button.php | 8 +++ .../base-theme/resources/lang/ar/fields.php | 33 ++++++++++++ .../base-theme/resources/lang/ar/message.php | 4 ++ .../base-theme/resources/lang/ar/setting.php | 35 +++++++++++++ 5 files changed, 130 insertions(+) create mode 100644 addons/default/visiosoft/base-theme/resources/lang/ar/addon.php create mode 100644 addons/default/visiosoft/base-theme/resources/lang/ar/button.php create mode 100644 addons/default/visiosoft/base-theme/resources/lang/ar/fields.php create mode 100644 addons/default/visiosoft/base-theme/resources/lang/ar/message.php create mode 100644 addons/default/visiosoft/base-theme/resources/lang/ar/setting.php diff --git a/addons/default/visiosoft/base-theme/resources/lang/ar/addon.php b/addons/default/visiosoft/base-theme/resources/lang/ar/addon.php new file mode 100644 index 000000000..69a57e357 --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/lang/ar/addon.php @@ -0,0 +1,50 @@ + 'الوصف', + 'post_ad' => 'انشر إعلانك', + 'profile' => 'الملف الشخصي', + 'my_messages' => 'رسائلي', + 'my_ads' => 'إعلاناتي', + 'login' => 'تسجيل الدخول', + 'logout' => 'تسجيل الخروج', + 'chose_language' => 'اختر اللغة', + + 'privacy_and_use' => 'الخصوصية والاستخدام', + 'sell_fast' => 'البيع السريع', + 'cloudsite' => 'موقع السحابة', + 'banner_advertising' => 'راية الإعلان', + 'trade_delivers' => 'أدوات التجارة', + 'promote_your_ad' => 'تعزيز إعلانك', + 'faq' => 'الأسئلة المتكررة', + 'follow_us_on' => 'تابعنا على', + 'newsletter' => 'النشرة الإخبارية', + 'subscribe' => 'اشترك!', + 'your_email' => 'بريدك الإلكتروني', + 'sign_up' => 'التسجيل', + 'copyright' => 'حقوق الطبع والنشر 2019. | طورت بواسطة', + 'cart' => 'سلتي', + 'search' => 'بحث', + 'type_your_keyword' => 'اكتب كلمتك المفتاحية', + 'categories' => 'الفئات', + 'contact_us' => '24/7 دعم العملاء', + 'help_center' => 'مركز المساعدة', + 'find_your_ad' => 'ابحث عن إعلانك', + 'vehicle_type' => 'نوع السيارة', + 'select_makes' => 'اختر الصانع', + 'browse_cars_by_makes'=> 'تصفح السيارات حسب الصانع', + 'featured_car_deals'=> 'عروض السيارات المميزة', + 'learn_more'=> 'تعلم المزيد', + 'advs_default_theme_homepage_mobile_app_title' => 'تنزيل من متجر التطبيقات', + 'advs_default_theme_homepage_mobile_app_available_on' => 'متوفر في', + 'all'=>'الكل', + 'trend_ads'=>'الإعلانات الشائعة', + 'single_cta1'=>'التداول الآمن', + 'single_cta2'=>'احصل على راحة البال مع زيادة الحماية للتداول الآمن.', + 'single_cta3'=>'دعم 24/7', + 'single_cta4'=>'خدمة العملاء 212 555 55 55', + 'single_cta5'=>'التجارة السهلة', + 'single_cta6'=>'مع خدمات الدفع الآمنة ، يمكن تنفيذ معاملاتك بشكل مريح.', + 'welcome'=> 'مرحبًا', +]; + diff --git a/addons/default/visiosoft/base-theme/resources/lang/ar/button.php b/addons/default/visiosoft/base-theme/resources/lang/ar/button.php new file mode 100644 index 000000000..d96ca1b36 --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/lang/ar/button.php @@ -0,0 +1,8 @@ + [ + 'name' => 'إرسال', + ], +]; + diff --git a/addons/default/visiosoft/base-theme/resources/lang/ar/fields.php b/addons/default/visiosoft/base-theme/resources/lang/ar/fields.php new file mode 100644 index 000000000..4723257f6 --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/lang/ar/fields.php @@ -0,0 +1,33 @@ + 'انشر إعلانك', + 'featured_ads' => "الإعلانات المميزة", + 'recent_ads' => "الإعلانات الحديثة", + 'trending_ads' => 'الإعلانات الشائعة', + 'search_map' => 'البحث على الخريطة', + 'search' => 'بحث', + 'categories' => 'الفئات', + 'city' => 'المدينة', + 'last_search' => 'لمواصلة البحث الأخير', + 'join-us' => 'انضم إلينا', + 'sign-in' => 'تسجيل الدخول', + 'new-here' => 'جديد هنا؟', + 'scroll-screen-for-details' => 'مرر الشاشة لعرض الجدول', + 'close' => 'إغلاق', + + + 'login' => 'تسجيل الدخول', + 'email' => [ + 'name' => 'عنوان البريد الإلكتروني', + ], + 'name' => [ + 'name' => 'الاسم', + ], + 'subject' => [ + 'name' => 'العنوان', + ], + 'content' => [ + 'name' => 'المحتوى', + ], +]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/ar/message.php b/addons/default/visiosoft/base-theme/resources/lang/ar/message.php new file mode 100644 index 000000000..c5c23e41e --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/lang/ar/message.php @@ -0,0 +1,4 @@ + [ + 'name' => 'كلمات ميتا المفتاحية', + ], + 'template' => [ + 'name' => 'القالب', + ], + 's-type-latest-limit' => [ + 'name' => 'الحد الأقصى من نوع-اس', + ], + 's-type-showcase' => [ + 'name' => 'اسم حد عرض S-type', + ], + 's-type-banner-code' => [ + 'name' => 'رمز شعار نوع-اس', + ], + + 's-type-banner-mobile-code' => [ + 'name' => 'رمز الجوال لراية نوع-اس', + ], + + 'show_post_your_add_btn' => [ + 'name' => 'أظهر زر "انشر اعلانك"', + ], + + 'show_home_search_on_map_btn' => [ + 'name' => 'أظهر زر "على الخريطة" في البحث في الصفحة الرئيسية', + ], + + 'show_last_search_btn' => [ + 'name' => 'أظهر زر "آخر عملية بحث"', + ], +]; From 2f00c8f35421aaef87181be744fe80cebed911ca Mon Sep 17 00:00:00 2001 From: Diatrex Date: Fri, 22 Nov 2019 18:25:47 +0300 Subject: [PATCH 18/24] second commit --- addons/default/visiosoft/rota-module | 1 + 1 file changed, 1 insertion(+) create mode 160000 addons/default/visiosoft/rota-module diff --git a/addons/default/visiosoft/rota-module b/addons/default/visiosoft/rota-module new file mode 160000 index 000000000..7aac5b4a4 --- /dev/null +++ b/addons/default/visiosoft/rota-module @@ -0,0 +1 @@ +Subproject commit 7aac5b4a44924daeb115b458a44351494b57dcfb From b4c27aed876985c4134524838691dd5f88089e4d Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 25 Nov 2019 09:05:16 +0300 Subject: [PATCH 19/24] Remove rota-module folder --- addons/default/visiosoft/rota-module | 1 - 1 file changed, 1 deletion(-) delete mode 160000 addons/default/visiosoft/rota-module diff --git a/addons/default/visiosoft/rota-module b/addons/default/visiosoft/rota-module deleted file mode 160000 index 7aac5b4a4..000000000 --- a/addons/default/visiosoft/rota-module +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7aac5b4a44924daeb115b458a44351494b57dcfb From 7887cfeb810d2d88e39a5ca7b8c50f2483bfdca4 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Wed, 27 Nov 2019 10:31:52 +0300 Subject: [PATCH 20/24] #158 Recent Ads is not working --- .../advs-module/src/Http/Controller/Admin/AdvsController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php index b11bf6342..946e5e5f5 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php @@ -189,6 +189,7 @@ class AdvsController extends AdminController $default_adv_publish = $settings->value('visiosoft.module.advs::default_published_time'); $adv->finish_at = date('Y-m-d H:i:s', strtotime(date('Y-m-d H:i:s') . ' + ' . $default_adv_publish . ' day')); + $adv->publish_at = date('Y-m-d H:i:s'); //algolia Search Module $isActiveAlgolia = new AdvModel(); From 23a801f4088c3a30547c23a2fce207fbeddc2ac5 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Fri, 29 Nov 2019 10:47:05 +0300 Subject: [PATCH 21/24] #505 --- .../resources/views/ad-detail/partials/author-button.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/author-button.twig b/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/author-button.twig index 11bcc2500..4c7b4249b 100644 --- a/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/author-button.twig +++ b/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/author-button.twig @@ -1,6 +1,6 @@ {% if app.auth.id == adv.created_by_id %} + class="fas fa-pencil-alt"> {{ trans('visiosoft.module.advs::field.edit') }} {% if adv.status != "pending_admin" and adv.status != "approved" %} Date: Fri, 29 Nov 2019 17:50:57 +0300 Subject: [PATCH 22/24] #162 Creating Multiple cats once --- .../cats-module/resources/lang/en/field.php | 2 +- .../Controller/Admin/CategoryController.php | 89 ++++++++++++++++++- 2 files changed, 86 insertions(+), 5 deletions(-) diff --git a/addons/default/visiosoft/cats-module/resources/lang/en/field.php b/addons/default/visiosoft/cats-module/resources/lang/en/field.php index 05f8d2c61..ab6a13cfe 100644 --- a/addons/default/visiosoft/cats-module/resources/lang/en/field.php +++ b/addons/default/visiosoft/cats-module/resources/lang/en/field.php @@ -20,7 +20,7 @@ return [ 'name' => 'Seo Description' ], 'icon' => [ -' name' => 'ICON' + 'name' => 'Icon' ], 'please_wait' => 'Please wait.Deleting Sub Categories', 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 1096855b8..c1ea61cba 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 @@ -2,9 +2,11 @@ use Anomaly\Streams\Platform\Image\Command\MakeImageInstance; use Anomaly\Streams\Platform\Model\Cats\CatsCategoryEntryModel; +use Anomaly\Streams\Platform\Model\Cats\CatsCategoryEntryTranslationsModel; use Illuminate\Http\Request; +use Illuminate\Support\Facades\DB; +use Illuminate\Support\Str; use Sunra\PhpSimple\HtmlDomParser; -use Visiosoft\CatsModule\Category\CategoryCollection; use Visiosoft\CatsModule\Category\CategoryModel; use Visiosoft\CatsModule\Category\Contract\CategoryRepositoryInterface; use Visiosoft\CatsModule\Category\Form\CategoryFormBuilder; @@ -13,6 +15,22 @@ use Anomaly\Streams\Platform\Http\Controller\AdminController; class CategoryController extends AdminController { + private $categoryRepository; + private $categoryEntryTranslationsModel; + private $str; + + public function __construct( + CategoryRepositoryInterface $categoryRepository, + CatsCategoryEntryTranslationsModel $categoryEntryTranslationsModel, + Str $str + ) + { + parent::__construct(); + $this->categoryRepository = $categoryRepository; + $this->categoryEntryTranslationsModel = $categoryEntryTranslationsModel; + $this->str = $str; + } + public function index(CategoryTableBuilder $table, Request $request) { if ($this->request->action == "delete") { @@ -55,10 +73,66 @@ class CategoryController extends AdminController return $this->redirect->back(); } - $form->make(); - if ($form->hasFormErrors()) { - return $this->redirect->to('/admin/cats/create'); + $locale = DB::table('cats_category_translations')->select('locale')->distinct()->get()->toArray(); + $translatable = array(); + foreach ($all as $key => $value) { + foreach ($locale as $lang) { + if ($this->endsWith($key, "_$lang->locale") && !in_array(substr($key, 0, -3), $translatable)) { + $translatable[] = substr($key, 0, -3); + } + } } + $translatableEntries = array(); + foreach ($locale as $lang) { + $translatableEntries[$lang->locale] = array(); + foreach ($translatable as $translatableEntry) { + $translatableEntries[$lang->locale][$translatableEntry] = $all[$translatableEntry . '_' . $lang->locale]; + } + } + + // Check if there is multiple categories in the name filed + $isMultiCat = array(); + foreach ($translatableEntries as $key => $translatableEntry) { + $multiCat = explode(",", $translatableEntry['name']); + if (count($multiCat) > 1) { + $firstArray = array(); + foreach ($multiCat as $cat) { + $secondArray = array(); + foreach ($locale as $lang) { + if ($key === $lang->locale) { + $secondArray[$key]['name'] = trim($cat); + } + } + array_push($firstArray, $secondArray); + } + array_push($isMultiCat, $firstArray); + } + } + for ($i = 0; $i < count($isMultiCat[0]); $i++) { + foreach ($isMultiCat as $cat) { + $translatableEntries = array_merge($translatableEntries, $cat[$i]); + } + $this->categoryRepository->create(array_merge($translatableEntries, [ + 'slug' => $this->str->slug(reset($translatableEntries)['name'], '_'), + 'parent_category' => $all['parent_category'], + 'icon' => $all['icon'], + 'seo_keyword' => $all['seo_keyword'], + 'seo_description' => $all['seo_description'], + ])); + } + +// $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); } @@ -81,6 +155,13 @@ class CategoryController extends AdminController return $this->view->make('visiosoft.module.cats::cats/admin-cat', compact('nameField', 'formBuilder')); } + public function endsWith($string, $test) { + $strlen = strlen($string); + $testlen = strlen($test); + if ($testlen > $strlen) return false; + return substr_compare($string, $test, $strlen - $testlen, $testlen) === 0; + } + public function edit(CategoryFormBuilder $form, Request $request, $id) { From f5809246ac2d50a8fc6b419a37776b61183aabef Mon Sep 17 00:00:00 2001 From: Diatrex Date: Fri, 29 Nov 2019 18:03:22 +0300 Subject: [PATCH 23/24] #162 Creating Multiple cats once --- .../Controller/Admin/CategoryController.php | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) 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 c1ea61cba..671275bac 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 @@ -108,18 +108,28 @@ class CategoryController extends AdminController array_push($isMultiCat, $firstArray); } } - for ($i = 0; $i < count($isMultiCat[0]); $i++) { - foreach ($isMultiCat as $cat) { - $translatableEntries = array_merge($translatableEntries, $cat[$i]); - } - $this->categoryRepository->create(array_merge($translatableEntries, [ - 'slug' => $this->str->slug(reset($translatableEntries)['name'], '_'), + if (empty($isMultiCat)) { + $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'], ])); - } + } else { + for ($i = 0; $i < count($isMultiCat[0]); $i++) { + foreach ($isMultiCat as $cat) { + $translatableEntries = array_merge($translatableEntries, $cat[$i]); + } + $this->categoryRepository->create(array_merge($translatableEntries, [ + 'slug' => $this->str->slug(reset($translatableEntries)['name'], '_'), + 'parent_category' => $all['parent_category'], + 'icon' => $all['icon'], + 'seo_keyword' => $all['seo_keyword'], + 'seo_description' => $all['seo_description'], + ])); + } + }; // $this->categoryRepository->create(array_merge($translatableEntries, [ // 'slug' => $all['slug'], From 7dd32d2f3b8c0ec22ebe4ffe9fb940ce2a60fa92 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 2 Dec 2019 09:34:19 +0300 Subject: [PATCH 24/24] #162 update gives an error --- .../src/Http/Controller/Admin/CategoryController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 671275bac..a0c4ebef5 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 @@ -111,7 +111,7 @@ class CategoryController extends AdminController if (empty($isMultiCat)) { $this->categoryRepository->create(array_merge($translatableEntries, [ 'slug' => $all['slug'], - 'parent_category' => $all['parent_category'], + 'parent_category' => $all['parent_category'] === "" ? null : $all['parent_category'], 'icon' => $all['icon'], 'seo_keyword' => $all['seo_keyword'], 'seo_description' => $all['seo_description'], @@ -123,7 +123,7 @@ class CategoryController extends AdminController } $this->categoryRepository->create(array_merge($translatableEntries, [ 'slug' => $this->str->slug(reset($translatableEntries)['name'], '_'), - 'parent_category' => $all['parent_category'], + 'parent_category' => $all['parent_category'] === "" ? null : $all['parent_category'], 'icon' => $all['icon'], 'seo_keyword' => $all['seo_keyword'], 'seo_description' => $all['seo_description'],