From c75769e45c7ed3a284f77f166ce415e98b97cc2c Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Tue, 2 Mar 2021 13:15:15 +0300 Subject: [PATCH 01/19] #3408 header currency --- .../src/Http/Controller/advsController.php | 13 +++++++++++++ database/seeds/DatabaseSeeder.php | 2 ++ 2 files changed, 15 insertions(+) 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 fc02329eb..b4130bbbf 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -255,6 +255,12 @@ class AdvsController extends PublicController foreach ($advs as $index => $ad) { $advs[$index]->detail_url = $this->adv_model->getAdvDetailLinkByModel($ad, 'list'); $advs[$index] = $this->adv_model->AddAdsDefaultCoverImage($ad); + + $foreign_currencies = json_decode($advs[$index]->foreign_currencies, true); + if ($_COOKIE['currency'] && $advs[$index]->foreign_currencies && array_key_exists($_COOKIE['currency'], $foreign_currencies)) { + $advs[$index]->currency = $_COOKIE['currency']; + $advs[$index]->price = $foreign_currencies[$_COOKIE['currency']]; + } } if ($isActiveCustomFields) { @@ -584,6 +590,13 @@ class AdvsController extends PublicController $configurations = $this->optionConfigurationRepository->getConf($adv->id); + + $foreign_currencies = json_decode($adv->foreign_currencies, true); + if ($_COOKIE['currency'] && $adv->foreign_currencies && array_key_exists($_COOKIE['currency'], $foreign_currencies)) { + $adv->currency = $_COOKIE['currency']; + $adv->price = $foreign_currencies[$_COOKIE['currency']]; + } + if ($adv->created_by_id == isset(auth()->user()->id) or $adv->status == "approved") { return $this->view->make('visiosoft.module.advs::ad-detail/detail', compact('adv', 'complaints', 'recommended_advs', 'categories', 'features', 'options', 'configurations')); diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index 6616a3315..744f86f10 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -56,6 +56,8 @@ class DatabaseSeeder extends Seeder $this->users->newQuery()->where('email', "info@openclassify.com")->forceDelete(); $visiosoft_administrator = $this->users->create( [ + 'first_name' => 'Dev', + 'last_name' => 'Openclassify', 'display_name' => 'openclassify', 'email' => "info@openclassify.com", 'username' => "openclassify", From c74b8139e320dd0a448a63983d7b668e2e560787 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Thu, 4 Mar 2021 13:30:38 +0300 Subject: [PATCH 02/19] #3481 [advs-module] Currency error when viewing an ad --- .../advs-module/src/Http/Controller/advsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c068428ec..f475df342 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -592,7 +592,7 @@ class AdvsController extends PublicController $foreign_currencies = json_decode($adv->foreign_currencies, true); - if ($_COOKIE['currency'] && $adv->foreign_currencies && array_key_exists($_COOKIE['currency'], $foreign_currencies)) { + if (isset($_COOKIE['currency']) && $_COOKIE['currency'] && $adv->foreign_currencies && array_key_exists($_COOKIE['currency'], $foreign_currencies)) { $adv->currency = $_COOKIE['currency']; $adv->price = $foreign_currencies[$_COOKIE['currency']]; } From 0941e43f6caeb1c692586571c2c69149a26871b8 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Thu, 4 Mar 2021 13:37:10 +0300 Subject: [PATCH 03/19] #3367 Ad price hide by category (franch) --- .../resources/config/settings/sections.php | 3 ++- .../resources/config/settings/settings.php | 8 ++++++++ .../advs-module/resources/lang/en/setting.php | 4 ++++ .../resources/views/new-ad/new-create.twig | 3 +-- .../src/Http/Controller/advsController.php | 20 +++++++++++++++---- 5 files changed, 31 insertions(+), 7 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php index ff2f5c9f1..9222867a3 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php @@ -14,8 +14,9 @@ return [ 'google_statistic_code', 'ogImage', 'free_currencyconverterapi_key', + 'hide_price_categories', + 'tcmb_exchange_url', 'enabled_currencies', - 'tcmb_exchange_url' ], ], 'ads' => [ diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php index 134b47b73..dded12c5b 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php @@ -94,6 +94,14 @@ return [ "default_value" => "1eea72940f3868c77420" ] ], + 'hide_price_categories' => [ + 'type' => 'anomaly.field_type.checkboxes', + 'config' => [ + 'options' => function (\Visiosoft\CatsModule\Category\Contract\CategoryRepositoryInterface $categoryRepository) { + return $categoryRepository->mainCats()->pluck('name', 'id')->all(); + }, + ], + ], 'default_GET' => [ 'type' => 'anomaly.field_type.boolean', 'bind' => 'adv.default_GET', diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php index 0a7c4e30d..01f5e9639 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php @@ -61,6 +61,10 @@ return [ 'default_country' => [ 'name' => 'Default Ad Country', ], + 'hide_price_categories' => [ + 'name' => 'Hide Price On Categories', + 'instructions' => 'The price will be hidden when you create an ad or view an ad under these categories.' + ], 'free_currencyconverterapi_key' => [ 'name' => 'Currency Converter API Key' ], diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig index bb5ab25ad..9faa16334 100644 --- a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig +++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig @@ -90,8 +90,7 @@ -
+
- {{ form.fields.password.input|raw }} + {{ form.fields.password.setValue(app.request.get('password')).input|raw }}
From d707ae24a51207c2740a3fda823f0ebf6d2d58fb Mon Sep 17 00:00:00 2001 From: vedatakd Date: Wed, 10 Mar 2021 11:22:44 +0300 Subject: [PATCH 11/19] fixed error --- .../advs-module/resources/views/list/partials/price-filter.twig | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig index 4939f0fd1..180820296 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig @@ -41,5 +41,4 @@ - {{ asset_script('visiosoft.module.advs::js/currency_format.js') }} {% endif %} \ No newline at end of file From a4f58f0a8d4c96366c5f2db876e69204735a0ca5 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Wed, 10 Mar 2021 11:31:23 +0300 Subject: [PATCH 12/19] remove --- .../MultipleFieldType/LookupTableBuilder.php | 10 ---------- .../MultipleFieldType/SelectedTableBuilder.php | 13 ------------- .../Support/MultipleFieldType/ValueTableBuilder.php | 13 ------------- 3 files changed, 36 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/LookupTableBuilder.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/LookupTableBuilder.php index 168217fd7..6d8baa6f3 100644 --- a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/LookupTableBuilder.php +++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/LookupTableBuilder.php @@ -1,19 +1,9 @@ - * @author Ryan Thompson - */ class LookupTableBuilder extends \Anomaly\MultipleFieldType\Table\LookupTableBuilder { public function __construct(Table $table,ValueTableBuilder $valueTableBuilder) diff --git a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/SelectedTableBuilder.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/SelectedTableBuilder.php index dccc81c96..99b456683 100644 --- a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/SelectedTableBuilder.php +++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/SelectedTableBuilder.php @@ -1,20 +1,7 @@ - * @author Ryan Thompson - */ class SelectedTableBuilder extends \Anomaly\MultipleFieldType\Table\SelectedTableBuilder { - - /** - * The table columns. - * - * @var array - */ protected $columns = [ 'name', 'product_option' ]; diff --git a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/ValueTableBuilder.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/ValueTableBuilder.php index b9a42c19b..0fa7cf397 100644 --- a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/ValueTableBuilder.php +++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/ValueTableBuilder.php @@ -1,20 +1,7 @@ - * @author Ryan Thompson - */ class ValueTableBuilder extends \Anomaly\MultipleFieldType\Table\ValueTableBuilder { - - /** - * The table columns. - * - * @var array - */ protected $columns = [ 'name', 'product_option' ]; From 2e07a12e6fd1133cabf64f6e8f5b81d79bf7d6de Mon Sep 17 00:00:00 2001 From: vedatakd Date: Wed, 10 Mar 2021 16:37:35 +0300 Subject: [PATCH 13/19] fixed currency_format default currency --- .../visiosoft/advs-module/src/Support/Command/Currency.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/src/Support/Command/Currency.php b/addons/default/visiosoft/advs-module/src/Support/Command/Currency.php index 12dfebc50..d7c2ac70f 100644 --- a/addons/default/visiosoft/advs-module/src/Support/Command/Currency.php +++ b/addons/default/visiosoft/advs-module/src/Support/Command/Currency.php @@ -5,7 +5,7 @@ class Currency public function format($number, $currency = null, array $options = []) { - $currency = strtoupper($currency ?: config('streams::currencies.default')); + $currency = strtoupper($currency ?: setting_value('streams::currency')); $direction = array_get( $options, From ecb9483a4dedd49b4e223845603c001fec684ffb Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Wed, 10 Mar 2021 17:24:27 +0300 Subject: [PATCH 14/19] #3522 hide ad date in ads list page --- .../advs-module/resources/views/list/table.twig | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) 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 c4a94399b..6cbc99d3c 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/table.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/table.twig @@ -9,8 +9,10 @@ class="text-center align-middle">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.name') }} {{ trans('visiosoft.module.advs::field.advs_list_table_thead.price') }} - {{ trans('visiosoft.module.advs::field.advs_list_table_thead.publish_at') }} + {% if not setting_value('visiosoft.module.advs::ads_date_hidden') %} + {{ trans('visiosoft.module.advs::field.advs_list_table_thead.publish_at') }} + {% endif %} {% if setting_value('visiosoft.module.location::list_page_location') %} {{ trans('visiosoft.module.advs::field.advs_list_table_thead.location_city') }} @@ -38,9 +40,11 @@ {{ currency_format(adv.price,adv.currency) }} - - {{ adv.created_at|date("d/m/Y") }} - + {% if not setting_value('visiosoft.module.advs::ads_date_hidden') %} + + {{ adv.created_at|date("d/m/Y") }} + + {% endif %} {% if setting_value('visiosoft.module.location::list_page_location') %} {{ adv.city_name }} / {{ adv.country_name }} From 4f9ffb46f1363d3541547175b48298c4174b8a50 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Thu, 11 Mar 2021 17:35:00 +0300 Subject: [PATCH 15/19] watermark settings --- .../resources/config/settings/sections.php | 1 + .../resources/config/settings/settings.php | 60 ++++++++++--------- .../advs-module/resources/lang/en/setting.php | 4 ++ .../src/Http/Controller/UploadController.php | 38 ++++++------ 4 files changed, 58 insertions(+), 45 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php index 9222867a3..84f6e8e67 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php @@ -62,6 +62,7 @@ return [ 'ads_image' => [ 'title' => 'visiosoft.module.advs::section.ads_image', 'fields' => [ + 'watermark', 'image_resize_backend', 'full_image_width', 'full_image_height', diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php index dded12c5b..467bf61e8 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php @@ -295,6 +295,12 @@ return [ 'default_value' => 600, ], ], + 'watermark' => [ + 'type' => 'anomaly.field_type.boolean', + 'config' => [ + 'default_value' => false, + ] + ], 'watermark_type' => [ 'type' => 'anomaly.field_type.select', 'bind' => 'adv.watermark_type', @@ -389,31 +395,31 @@ return [ }, ], ], - 'favicon' => [ - 'type' => 'anomaly.field_type.file', - ], - 'ads_date_hidden' => [ - 'type' => 'anomaly.field_type.boolean', - 'config' => [ - 'default_value' => false, - ] - ], - 'hide_listing_header' => [ - 'type' => 'anomaly.field_type.boolean', - 'config' => [ - 'default_value' => false, - ] - ], - 'hide_filter_section' => [ - 'type' => 'anomaly.field_type.boolean', - 'config' => [ - 'default_value' => false, - ] - ], - 'hide_seller_info' => [ - 'type' => 'anomaly.field_type.boolean', - 'config' => [ - 'default_value' => false, - ] - ] + 'favicon' => [ + 'type' => 'anomaly.field_type.file', + ], + 'ads_date_hidden' => [ + 'type' => 'anomaly.field_type.boolean', + 'config' => [ + 'default_value' => false, + ] + ], + 'hide_listing_header' => [ + 'type' => 'anomaly.field_type.boolean', + 'config' => [ + 'default_value' => false, + ] + ], + 'hide_filter_section' => [ + 'type' => 'anomaly.field_type.boolean', + 'config' => [ + 'default_value' => false, + ] + ], + 'hide_seller_info' => [ + 'type' => 'anomaly.field_type.boolean', + 'config' => [ + 'default_value' => false, + ] + ] ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php index 01f5e9639..823d2589a 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php @@ -247,4 +247,8 @@ return [ 'name' => 'GET Categories', 'instructions' => 'It represents the categories in which the GET property will be valid.' ], + 'watermark' => [ + 'name' => 'Watermark', + 'instructions' => 'Is watermark active?' + ], ]; diff --git a/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php b/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php index 0fdc0bdf4..7ad894ff6 100644 --- a/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php +++ b/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php @@ -118,26 +118,28 @@ class UploadController extends AdminController foreach ($image_types as $key => $image) { - if ($settings_value['watermark_type'] == 'image') { + if (setting_value('visiosoft.module.advs::watermark', false)) { + if ($settings_value['watermark_type'] == 'image') { + + if ($watermarkimage = $this->files->find($settings_value['watermark_image'])) { + $watermark = WaterMark::make(app_storage_path() . '/files-module/local/' . $watermarkimage->path()); + $image->insert($watermark, $settings_value['watermark_position']); + } + + } else { + $v = "top"; + $h = "center"; + $w = $image->width() / 2; + $h1 = $image->height() / 2; + $font_size = $w / 20; + $image->text(($watermark_text = setting_value('visiosoft.module.advs::watermark_text')) ? $watermark_text : 'Openclassify', $w, $h1, function ($font) use ($v, $h, $font_size) { + $font->file(public_path('Antonio-Bold.ttf')); + $font->size($font_size); + $font->align($h); + $font->valign($v); + }); - if ($watermarkimage = $this->files->find($settings_value['watermark_image'])) { - $watermark = WaterMark::make(app_storage_path() . '/files-module/local/' . $watermarkimage->path()); - $image->insert($watermark, $settings_value['watermark_position']); } - - } else { - $v = "top"; - $h = "center"; - $w = $image->width() / 2; - $h1 = $image->height() / 2; - $font_size = $w / 20; - $image->text(($watermark_text = setting_value('visiosoft.module.advs::watermark_text')) ? $watermark_text : 'Openclassify', $w, $h1, function ($font) use ($v, $h, $font_size) { - $font->file(public_path('Antonio-Bold.ttf')); - $font->size($font_size); - $font->align($h); - $font->valign($v); - }); - } if ($key === "full") { From 919cad01a0edf1265773f6917896d6ad1c94fdd9 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 12 Mar 2021 12:12:02 +0300 Subject: [PATCH 16/19] #3540 Sentry Enabled/Disabled add Senttings --- .../advs-module/resources/config/settings/sections.php | 1 + .../advs-module/resources/config/settings/settings.php | 3 ++- .../visiosoft/advs-module/resources/lang/en/setting.php | 3 +++ app/Exceptions/ExceptionHandler.php | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php index 9222867a3..f22cddc23 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php @@ -17,6 +17,7 @@ return [ 'hide_price_categories', 'tcmb_exchange_url', 'enabled_currencies', + 'close_sentry', ], ], 'ads' => [ diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php index dded12c5b..181e4e805 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php @@ -415,5 +415,6 @@ return [ 'config' => [ 'default_value' => false, ] - ] + ], + 'close_sentry' => 'anomaly.field_type.boolean', ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php index 01f5e9639..034aed70a 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php @@ -247,4 +247,7 @@ return [ 'name' => 'GET Categories', 'instructions' => 'It represents the categories in which the GET property will be valid.' ], + 'close_sentry' => [ + 'name' => 'Disable Sentry' + ] ]; diff --git a/app/Exceptions/ExceptionHandler.php b/app/Exceptions/ExceptionHandler.php index a789a8e71..af7768299 100644 --- a/app/Exceptions/ExceptionHandler.php +++ b/app/Exceptions/ExceptionHandler.php @@ -87,7 +87,7 @@ class ExceptionHandler extends Handler public function report(Exception $e) { - if (app()->bound('sentry') && $this->shouldReport($e)) { + if (!setting_value('visiosoft.module.advs::close_sentry') && app()->bound('sentry') && $this->shouldReport($e)) { app('sentry')->captureException($e); } From 4cea143922377966e8e9ebb010f8f12507bc5105 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 12 Mar 2021 12:13:24 +0300 Subject: [PATCH 17/19] #3540 Sentry Enabled/Disabled add Senttings --- .../advs-module/resources/config/settings/sections.php | 2 +- .../advs-module/resources/config/settings/settings.php | 2 +- .../default/visiosoft/advs-module/resources/lang/en/setting.php | 2 +- app/Exceptions/ExceptionHandler.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php index f22cddc23..ab3f3904a 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php @@ -17,7 +17,7 @@ return [ 'hide_price_categories', 'tcmb_exchange_url', 'enabled_currencies', - 'close_sentry', + 'disable_sentry', ], ], 'ads' => [ diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php index 181e4e805..436ca2ba6 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php @@ -416,5 +416,5 @@ return [ 'default_value' => false, ] ], - 'close_sentry' => 'anomaly.field_type.boolean', + 'disable_sentry' => 'anomaly.field_type.boolean', ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php index 034aed70a..7e06bcedb 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php @@ -247,7 +247,7 @@ return [ 'name' => 'GET Categories', 'instructions' => 'It represents the categories in which the GET property will be valid.' ], - 'close_sentry' => [ + 'disable_sentry' => [ 'name' => 'Disable Sentry' ] ]; diff --git a/app/Exceptions/ExceptionHandler.php b/app/Exceptions/ExceptionHandler.php index af7768299..316887aca 100644 --- a/app/Exceptions/ExceptionHandler.php +++ b/app/Exceptions/ExceptionHandler.php @@ -87,7 +87,7 @@ class ExceptionHandler extends Handler public function report(Exception $e) { - if (!setting_value('visiosoft.module.advs::close_sentry') && app()->bound('sentry') && $this->shouldReport($e)) { + if (!setting_value('visiosoft.module.advs::disable_sentry') && app()->bound('sentry') && $this->shouldReport($e)) { app('sentry')->captureException($e); } From 707faec5be05c5e94cf333c539a63e9a2ba123b8 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 12 Mar 2021 12:54:47 +0300 Subject: [PATCH 18/19] #3540 Sentry Enabled/Disabled add Senttings --- app/Exceptions/ExceptionHandler.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/Exceptions/ExceptionHandler.php b/app/Exceptions/ExceptionHandler.php index 316887aca..79492d1b8 100644 --- a/app/Exceptions/ExceptionHandler.php +++ b/app/Exceptions/ExceptionHandler.php @@ -87,7 +87,11 @@ class ExceptionHandler extends Handler public function report(Exception $e) { - if (!setting_value('visiosoft.module.advs::disable_sentry') && app()->bound('sentry') && $this->shouldReport($e)) { + if (!setting_value('visiosoft.module.advs::disable_sentry') + && app()->bound('sentry') + && $this->shouldReport($e) + && env('SENTRY_LARAVEL_DSN')) { + app('sentry')->captureException($e); } From 78114415c5e5ceabd019d6db4fc118247ba8efc1 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 12 Mar 2021 16:33:50 +0300 Subject: [PATCH 19/19] #3539 igam talepler 12.03 --- addons/default/visiosoft/advs-module/src/Adv/AdvCollection.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvCollection.php b/addons/default/visiosoft/advs-module/src/Adv/AdvCollection.php index 6fd2e6614..7631a12c0 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvCollection.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvCollection.php @@ -32,7 +32,7 @@ class AdvCollection extends EntryCollection { return $this->filter( function ($ad) { - return $ad->finish_at->gt(Carbon::now()); + return $ad->where('finish_at', '>', Carbon::now()); } ); }