From a229c6bec087da660f1350434bad668827889fdc Mon Sep 17 00:00:00 2001 From: Fatih Alp Date: Mon, 4 Jan 2021 00:31:56 +0300 Subject: [PATCH] Fixes for PHP 7.4 and Pyrocms 3.8 --- .../src/Adv/Table/AdvTableBuilder.php | 3 +-- .../src/Http/Controller/advsController.php | 23 ++++--------------- .../views/partials/categories-web.twig | 2 -- .../Category/Table/CategoryTableBuilder.php | 2 +- .../Controller/Admin/CitiesController.php | 2 +- .../src/Table/ValueTableBuilder.php | 1 - .../src/Table/ValueTableBuilder.php | 1 - 7 files changed, 7 insertions(+), 27 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableBuilder.php b/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableBuilder.php index 45466ee3b..b364b2b7e 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableBuilder.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableBuilder.php @@ -78,8 +78,7 @@ class AdvTableBuilder extends TableBuilder protected $options = [ 'order_by' => [ 'id' => 'DESC', - ], - 'table_view' => 'visiosoft.module.advs::admin/table/table' + ] ]; /** 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 52b0ac490..66755fd1c 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -23,7 +23,6 @@ use Visiosoft\AdvsModule\Option\Contract\OptionRepositoryInterface; use Visiosoft\AdvsModule\OptionConfiguration\Contract\OptionConfigurationRepositoryInterface; use Visiosoft\AdvsModule\Productoption\Contract\ProductoptionRepositoryInterface; use Visiosoft\AdvsModule\ProductoptionsValue\Contract\ProductoptionsValueRepositoryInterface; -use Visiosoft\AlgoliaModule\Search\SearchModel; use Visiosoft\CatsModule\Category\CategoryModel; use Visiosoft\CatsModule\Category\Contract\CategoryRepositoryInterface; use Visiosoft\CloudinaryModule\Video\VideoModel; @@ -257,7 +256,7 @@ class AdvsController extends PublicController $advs[$index]->detail_url = $this->adv_model->getAdvDetailLinkByModel($ad, 'list'); $advs[$index] = $this->adv_model->AddAdsDefaultCoverImage($ad); } - + $seenList = array(); if ($isActiveCustomFields) { $cfRepository = app('Visiosoft\CustomfieldsModule\CustomField\CustomFieldRepository'); @@ -286,7 +285,8 @@ class AdvsController extends PublicController $allCats = true; } - $cFArray = array(); + $cFArray = $checkboxes = $topfields = $selectDropdown = $selectRange = $selectImage = $ranges = $radio = array(); + if ($isActiveCustomFields) { $returnvalues = app('Visiosoft\CustomfieldsModule\Http\Controller\cfController')->index($mainCats, $subCats); $checkboxes = $returnvalues['checkboxes']; @@ -785,16 +785,6 @@ class AdvsController extends PublicController $adv->is_get_adv = $request->is_get_adv; $adv->save(); - //algolia Search Module - $isActiveAlgolia = $advModel->is_enabled('algolia'); - if ($isActiveAlgolia) { - $algolia = new SearchModel(); - if ($adv->slug == "") { - $algolia->saveAlgolia($adv->toArray(), $settings); - } else { - $algolia->updateAlgolia($request->toArray(), $settings); - } - } //Cloudinary Module $isActiveCloudinary = $advModel->is_enabled('cloudinary'); if ($isActiveCloudinary) { @@ -884,6 +874,7 @@ class AdvsController extends PublicController ->packageAddCart(\request()->pack_id, $new->id); } } + $events->dispatch(new EditAd($advModel)); return redirect('/advs/edit_advs/' . $new->id); } @@ -975,12 +966,6 @@ class AdvsController extends PublicController } } - $isActiveAlgolia = $this->adv_model->is_enabled('algolia'); - if ($isActiveAlgolia) { - $algolia = new SearchModel(); - $algolia->updateStatus($id, $type, $settings); - } - $this->adv_model->statusAds($id, $type); event(new ChangedStatusAd($ad));//Create Notify if ($type === 'approved') { diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/categories-web.twig b/addons/default/visiosoft/base-theme/resources/views/partials/categories-web.twig index 9dd2ccf83..13c5505a7 100644 --- a/addons/default/visiosoft/base-theme/resources/views/partials/categories-web.twig +++ b/addons/default/visiosoft/base-theme/resources/views/partials/categories-web.twig @@ -7,7 +7,6 @@ {{ main_category.name }} {% if showAdsCount %} - {% set catAdsCount = entries('advs', 'advs').countAdsByCategoryId(main_category.id) %} ({{ catAdsCount }}) @@ -33,7 +32,6 @@ {{ sub_category.name }} {% if showAdsCount %} {% set catLevel = getParentsCount(sub_category.id) + 1 %} - {% set catAdsCount = entries('advs', 'advs').countAdsByCategoryId(sub_category.id, catLevel) %} ({{ catAdsCount }}) 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 2a777889e..2845fe3e1 100644 --- a/addons/default/visiosoft/cats-module/src/Category/Table/CategoryTableBuilder.php +++ b/addons/default/visiosoft/cats-module/src/Category/Table/CategoryTableBuilder.php @@ -80,7 +80,7 @@ class CategoryTableBuilder extends TableBuilder * @var array */ protected $options = [ - 'table_view' => 'visiosoft.module.cats::table.table' + ]; /** diff --git a/addons/default/visiosoft/location-module/src/Http/Controller/Admin/CitiesController.php b/addons/default/visiosoft/location-module/src/Http/Controller/Admin/CitiesController.php index 6ed43feb3..2441a31ab 100644 --- a/addons/default/visiosoft/location-module/src/Http/Controller/Admin/CitiesController.php +++ b/addons/default/visiosoft/location-module/src/Http/Controller/Admin/CitiesController.php @@ -21,7 +21,7 @@ class CitiesController extends AdminController $cities = new CityModel(); if(!isset($request->country) || $request->country==""){ return $table->render(); - }else{ + } else { $cities = $cities->getSubCities($request->country); if (count($cities) == 0) { $this->messages->error('Selected country has no related city.'); diff --git a/addons/default/visiosoft/media-field_type/src/Table/ValueTableBuilder.php b/addons/default/visiosoft/media-field_type/src/Table/ValueTableBuilder.php index 8d0f55333..3141fee30 100644 --- a/addons/default/visiosoft/media-field_type/src/Table/ValueTableBuilder.php +++ b/addons/default/visiosoft/media-field_type/src/Table/ValueTableBuilder.php @@ -96,7 +96,6 @@ class ValueTableBuilder extends TableBuilder 'limit' => 9999, 'show_headers' => false, 'sortable_headers' => false, - 'table_view' => 'visiosoft.field_type.media::table/table', 'no_results_message' => 'visiosoft.field_type.media::message.no_files_selected', ]; diff --git a/addons/default/visiosoft/singlefile-field_type/src/Table/ValueTableBuilder.php b/addons/default/visiosoft/singlefile-field_type/src/Table/ValueTableBuilder.php index 9805cc021..9984cf37a 100644 --- a/addons/default/visiosoft/singlefile-field_type/src/Table/ValueTableBuilder.php +++ b/addons/default/visiosoft/singlefile-field_type/src/Table/ValueTableBuilder.php @@ -63,7 +63,6 @@ class ValueTableBuilder extends TableBuilder 'limit' => 1, 'show_headers' => false, 'sortable_headers' => false, - 'table_view' => 'visiosoft.field_type.singlefile::table', 'no_results_message' => 'visiosoft.field_type.singlefile::message.no_file_selected', ];