From baa55d81cd59735787fa00d4e93be035e9391e38 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Mon, 12 Jul 2021 12:59:12 +0300 Subject: [PATCH 01/23] #4334 add configurated ads to cart from ajax --- .../OptionConfigurationController.php | 105 ++++++++---------- 1 file changed, 45 insertions(+), 60 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/OptionConfigurationController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/OptionConfigurationController.php index ca9c43aca..133422108 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/OptionConfigurationController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/OptionConfigurationController.php @@ -1,87 +1,72 @@ advRepository = $advRepository; - $this->adv_model = $advModel; - $this->optionConfigurationModel = $optionConfigurationModel; - $this->optionConfigurationRepository = $optionConfigurationRepository; - parent::__construct(); - } + public function __construct( + AdvModel $advModel, + OptionConfigurationRepositoryInterface $optionConfigurationRepository, + CartRepository $cartRepository + ) + { + $this->adv_model = $advModel; + $this->optionConfigurationRepository = $optionConfigurationRepository; + $this->cartRepository = $cartRepository; + parent::__construct(); + } - public function create(OptionConfigurationFormBuilder $form) - { - $form->setOption('redirect', route('advs_preview', [request('ad')])); - return $form->render(); - } + public function create(OptionConfigurationFormBuilder $form) + { + $form->setOption('redirect', route('advs_preview', [request('ad')])); + return $form->render(); + } - public function confAddCart() - { - if($conf = $this->optionConfigurationRepository->find($this->request->configuration)) - { - if($conf->parent_adv->getStatus() == "approved") - { + public function confAddCart() + { + if ($conf = $this->optionConfigurationRepository->find($this->request->configuration)) { + if ($conf->parent_adv->getStatus() == "approved") { $conf->name = $conf->getName(); - if ($conf->stock < $this->request->quantity){ + if ($conf->stock < $this->request->quantity) { return redirect()->back()->with('warning', [trans('visiosoft.module.carts::message.error1in2')]); - }else{ + } else { $cart = $this->dispatch(new GetCart()); $cart->add($conf, $this->request->quantity); return $this->redirect->to(route('visiosoft.module.carts::cart')); } } - $this->messages->info(trans('visiosoft.module.advs::message.error_added_cart')); - return back(); - } - } + $this->messages->info(trans('visiosoft.module.advs::message.error_added_cart')); + return back(); + } + } - public function ajaxConfAddCart() - { - if (\auth()->check()) { - if($conf = $this->optionConfigurationRepository->find($this->request->configuration)) - { - $conf->name = $conf->getName(); + public function ajaxConfAddCart() + { + if ($conf = $this->optionConfigurationRepository->find($this->request->configuration ?? $this->request->data['conf'])) { + $conf->name = $conf->getName(); - $this->adv_model->authControl(); + if ($conf->stock < $this->request->quantity) { + return $this->response->json(['status' => 'error', 'msg' => trans('visiosoft.module.carts::message.error1in2')]); + } - if ($conf->stock < $this->request->quantity){ - return $this->response->json(['status' => 'error', 'msg' => trans('visiosoft.module.carts::message.error1in2')]); - }else{ - $cart = $this->dispatch(new GetCart()); - $cart->add($conf, $this->request->quantity); + $cart = $this->dispatch(new GetCart()); + $cart->add($conf, ($this->request->quantity ?? $this->request->data['quantity']) ?? 1); - $count = $cart->getItems()->count; - return $this->response->json(['status'=> 'success', 'count' => $count]); - } - } - return $this->response->json(['status' => 'error', 'msg' => trans('visiosoft.module.carts::message.error2')]); - } - return $this->response->json(['status' => 'guest']); - } + $cart_item = $cart->getItems(); + $count = $cart_item->count; + $cart = $this->cartRepository->find($cart_item[0]->cart_id); + return $this->response->json(['status' => 'success', 'count' => $count, 'cart' => $cart, 'cart_item' => $cart_item]); + } + return $this->response->json(['status' => 'error', 'msg' => trans('visiosoft.module.carts::message.error2')]); + } } From 8cc271f228bfb4e602a4ea0ccf3e475371c71769 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Wed, 14 Jul 2021 16:31:25 +0300 Subject: [PATCH 02/23] fixed dutch(nl) --- .../visiosoft/advs-module/resources/lang/nl/setting.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/lang/nl/setting.php b/addons/default/visiosoft/advs-module/resources/lang/nl/setting.php index d9bc4fcff..842386a6c 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/nl/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/nl/setting.php @@ -45,7 +45,7 @@ return [ ], 'currencies' => [ - 'name' => 'Actieve valuta\\'s', + 'name' => 'Actieve valuta\'s', ], 'latest-limit' => [ 'name' => 'Laatste limiet', @@ -123,7 +123,7 @@ return [ 'name' => 'Verberg aanbieding standaardprijs', ], 'enabled_currencies' => [ - 'name' => 'Ingeschakelde valuta\\'s', + 'name' => 'Ingeschakelde valuta\'s', ], 'google_statistic_code' => [ 'name' => 'Google-statistiekcode', From 1cbd083b5b17d5ae92519e6828a2858d596557da Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Wed, 14 Jul 2021 18:01:12 +0300 Subject: [PATCH 03/23] #4192 booking page design --- .../visiosoft/base-theme/resources/views/layouts/booking.twig | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/default/visiosoft/base-theme/resources/views/layouts/booking.twig b/addons/default/visiosoft/base-theme/resources/views/layouts/booking.twig index e7973bae5..fe7d5ad90 100644 --- a/addons/default/visiosoft/base-theme/resources/views/layouts/booking.twig +++ b/addons/default/visiosoft/base-theme/resources/views/layouts/booking.twig @@ -4,6 +4,7 @@ {% block styles %}{% endblock %} + {{ asset_style("visiosoft.theme.base::css/offline.scss") }}
From 42e739b28707153a8baf63f61fe0a9bd058c0040 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Thu, 15 Jul 2021 15:16:42 +0300 Subject: [PATCH 04/23] #4345 language flag and warning for new posting --- .../resources/config/settings/sections.php | 1 + .../resources/config/settings/settings.php | 8 +- .../advs-module/resources/images/flags/ar.svg | 9 ++ .../advs-module/resources/images/flags/de.svg | 8 ++ .../advs-module/resources/images/flags/el.svg | 72 ++++++++++++++ .../advs-module/resources/images/flags/en.svg | 12 +++ .../advs-module/resources/images/flags/es.svg | 65 +++++++++++++ .../advs-module/resources/images/flags/fa.svg | 21 ++++ .../advs-module/resources/images/flags/fr.svg | 9 ++ .../advs-module/resources/images/flags/it.svg | 9 ++ .../advs-module/resources/images/flags/nl.svg | 8 ++ .../advs-module/resources/images/flags/pt.svg | 95 +++++++++++++++++++ .../advs-module/resources/images/flags/ru.svg | 8 ++ .../advs-module/resources/images/flags/tr.svg | 7 ++ .../advs-module/resources/images/flags/zh.svg | 12 +++ .../advs-module/resources/lang/en/field.php | 1 + .../advs-module/resources/lang/en/setting.php | 10 +- .../views/form/partials/translations.twig | 21 ++++ .../src/AdvsModuleServiceProvider.php | 4 + 19 files changed, 376 insertions(+), 4 deletions(-) create mode 100644 addons/default/visiosoft/advs-module/resources/images/flags/ar.svg create mode 100644 addons/default/visiosoft/advs-module/resources/images/flags/de.svg create mode 100644 addons/default/visiosoft/advs-module/resources/images/flags/el.svg create mode 100644 addons/default/visiosoft/advs-module/resources/images/flags/en.svg create mode 100644 addons/default/visiosoft/advs-module/resources/images/flags/es.svg create mode 100644 addons/default/visiosoft/advs-module/resources/images/flags/fa.svg create mode 100644 addons/default/visiosoft/advs-module/resources/images/flags/fr.svg create mode 100644 addons/default/visiosoft/advs-module/resources/images/flags/it.svg create mode 100644 addons/default/visiosoft/advs-module/resources/images/flags/nl.svg create mode 100644 addons/default/visiosoft/advs-module/resources/images/flags/pt.svg create mode 100644 addons/default/visiosoft/advs-module/resources/images/flags/ru.svg create mode 100644 addons/default/visiosoft/advs-module/resources/images/flags/tr.svg create mode 100644 addons/default/visiosoft/advs-module/resources/images/flags/zh.svg create mode 100644 addons/default/visiosoft/advs-module/resources/views/form/partials/translations.twig 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 8b322a998..247210f87 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php @@ -66,6 +66,7 @@ return [ 'make_map_required', 'show_breadcrumb_when_creating_ad', 'show_post_ad_agreement', + 'show_input_flag', ], ], 'ads_image' => [ 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 b99a1fa65..83a75233d 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php @@ -474,5 +474,11 @@ return [ 'config' => [ 'default_value' => false, ] - ] + ], + 'show_input_flag' => [ + 'type' => 'anomaly.field_type.boolean', + 'config' => [ + 'default_value' => false, + ] + ] ]; diff --git a/addons/default/visiosoft/advs-module/resources/images/flags/ar.svg b/addons/default/visiosoft/advs-module/resources/images/flags/ar.svg new file mode 100644 index 000000000..00460a191 --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/flags/ar.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/addons/default/visiosoft/advs-module/resources/images/flags/de.svg b/addons/default/visiosoft/advs-module/resources/images/flags/de.svg new file mode 100644 index 000000000..6a45408fe --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/flags/de.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/addons/default/visiosoft/advs-module/resources/images/flags/el.svg b/addons/default/visiosoft/advs-module/resources/images/flags/el.svg new file mode 100644 index 000000000..cecd03a42 --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/flags/el.svg @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/default/visiosoft/advs-module/resources/images/flags/en.svg b/addons/default/visiosoft/advs-module/resources/images/flags/en.svg new file mode 100644 index 000000000..570980821 --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/flags/en.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/addons/default/visiosoft/advs-module/resources/images/flags/es.svg b/addons/default/visiosoft/advs-module/resources/images/flags/es.svg new file mode 100644 index 000000000..1e5595d57 --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/flags/es.svg @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/default/visiosoft/advs-module/resources/images/flags/fa.svg b/addons/default/visiosoft/advs-module/resources/images/flags/fa.svg new file mode 100644 index 000000000..2ad1bea4f --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/flags/fa.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/default/visiosoft/advs-module/resources/images/flags/fr.svg b/addons/default/visiosoft/advs-module/resources/images/flags/fr.svg new file mode 100644 index 000000000..b151931f2 --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/flags/fr.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/addons/default/visiosoft/advs-module/resources/images/flags/it.svg b/addons/default/visiosoft/advs-module/resources/images/flags/it.svg new file mode 100644 index 000000000..6470fd568 --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/flags/it.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/addons/default/visiosoft/advs-module/resources/images/flags/nl.svg b/addons/default/visiosoft/advs-module/resources/images/flags/nl.svg new file mode 100644 index 000000000..f1487961f --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/flags/nl.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/addons/default/visiosoft/advs-module/resources/images/flags/pt.svg b/addons/default/visiosoft/advs-module/resources/images/flags/pt.svg new file mode 100644 index 000000000..c7a8d18bf --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/flags/pt.svg @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/default/visiosoft/advs-module/resources/images/flags/ru.svg b/addons/default/visiosoft/advs-module/resources/images/flags/ru.svg new file mode 100644 index 000000000..2e85ebda8 --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/flags/ru.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/addons/default/visiosoft/advs-module/resources/images/flags/tr.svg b/addons/default/visiosoft/advs-module/resources/images/flags/tr.svg new file mode 100644 index 000000000..c8fda48b2 --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/flags/tr.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/addons/default/visiosoft/advs-module/resources/images/flags/zh.svg b/addons/default/visiosoft/advs-module/resources/images/flags/zh.svg new file mode 100644 index 000000000..4d0b91b85 --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/flags/zh.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + 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 cd7e80b4e..b26c57483 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/field.php @@ -382,4 +382,5 @@ return [ ], 'name_a_z' => 'Name (A to Z)', 'name_z_a' => 'Name (Z to A)', + 'select_lang_ads' => 'select the language of the ads', ]; 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 9eb3da933..fbe003c58 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php @@ -133,8 +133,8 @@ return [ ], 'market_place' => [ 'name' => 'Market Place', - 'instructions' => 'If the marketplace is down, your site will act as ecommerce. For example, - some fields in the profile such as ads, dopings, messages, sale, packages and store are not visible and + 'instructions' => 'If the marketplace is down, your site will act as ecommerce. For example, + some fields in the profile such as ads, dopings, messages, sale, packages and store are not visible and removes corporate membership.' ], 'price_area_hidden' => [ @@ -285,5 +285,9 @@ return [ ], 'hide_contact_created_at' => [ 'name' => 'Hide Contact Fields For in Create New Ad' - ] + ], + 'show_input_flag' => [ + 'name' => 'Show Flags on Input', + 'instructions' => 'Show flag and description on translatable inputs' + ] ]; diff --git a/addons/default/visiosoft/advs-module/resources/views/form/partials/translations.twig b/addons/default/visiosoft/advs-module/resources/views/form/partials/translations.twig new file mode 100644 index 000000000..a780844ce --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/views/form/partials/translations.twig @@ -0,0 +1,21 @@ +
+ {% if setting_value('visiosoft.module.advs::show_input_flag') %} + {{ img('visiosoft.module.advs::images/flags/' ~ field_type.locale ~ '.svg').width(20)|raw }} + {% endif %} + + {{ trans('streams::locale.' ~ field_type.locale ~ '.name') }} + +
+ {% for iso in config_get('streams::locales.enabled') %} + + {{ trans('streams::locale.' ~ iso ~ '.name') }} + + {% endfor %} +
+
+
+ + ***{{ trans('visiosoft.module.advs::field.select_lang_ads') }} + diff --git a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php index 14fc29ca9..73ebc37ee 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php @@ -271,6 +271,10 @@ class AdvsModuleServiceProvider extends AddonServiceProvider StatusRepositoryInterface::class => StatusRepository::class, ]; + protected $overrides = [ + 'streams::form.partials.translations' => 'visiosoft.module.advs::form.partials.translations', + ]; + public function boot(AddonCollection $addonCollection, FileModel $fileModel,CategoryRepositoryInterface $categoryRepository) { From 3d281a52a7134a5c27a688684d31bb9404009aec Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Thu, 15 Jul 2021 15:25:19 +0300 Subject: [PATCH 05/23] #4345 language flag and warning for new posting --- .../views/form/partials/translations.twig | 42 ++++++++++--------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/form/partials/translations.twig b/addons/default/visiosoft/advs-module/resources/views/form/partials/translations.twig index a780844ce..319d09ee6 100644 --- a/addons/default/visiosoft/advs-module/resources/views/form/partials/translations.twig +++ b/addons/default/visiosoft/advs-module/resources/views/form/partials/translations.twig @@ -1,21 +1,23 @@ -
- {% if setting_value('visiosoft.module.advs::show_input_flag') %} - {{ img('visiosoft.module.advs::images/flags/' ~ field_type.locale ~ '.svg').width(20)|raw }} - {% endif %} - - {{ trans('streams::locale.' ~ field_type.locale ~ '.name') }} - -
- {% for iso in config_get('streams::locales.enabled') %} - - {{ trans('streams::locale.' ~ iso ~ '.name') }} - - {% endfor %} +{% if config_get('streams::locales.enabled')|length > 1 %} +
+ {% if setting_value('visiosoft.module.advs::show_input_flag') %} + {{ img('visiosoft.module.advs::images/flags/' ~ field_type.locale ~ '.svg').width(20)|raw }} + {% endif %} + + {{ trans('streams::locale.' ~ field_type.locale ~ '.name') }} + +
+ {% for iso in config_get('streams::locales.enabled') %} + + {{ trans('streams::locale.' ~ iso ~ '.name') }} + + {% endfor %} +
-
-
- - ***{{ trans('visiosoft.module.advs::field.select_lang_ads') }} - +
+ + ***{{ trans('visiosoft.module.advs::field.select_lang_ads') }} + +{% endif %} From 5e67b24866e751bca9c5edb6003c03c0697eeecb Mon Sep 17 00:00:00 2001 From: vedatakd Date: Fri, 16 Jul 2021 15:11:18 +0300 Subject: [PATCH 06/23] move env --- .env_demo | 5 ++++- .../resources/config/settings/sections.php | 1 - .../resources/config/settings/settings.php | 1 - .../advs-module/resources/lang/af/setting.php | 3 --- .../advs-module/resources/lang/ar/setting.php | 3 --- .../advs-module/resources/lang/az/setting.php | 3 --- .../advs-module/resources/lang/bg/setting.php | 3 --- .../advs-module/resources/lang/bn/setting.php | 3 --- .../advs-module/resources/lang/ca/setting.php | 3 --- .../advs-module/resources/lang/cs/setting.php | 3 --- .../advs-module/resources/lang/da/setting.php | 3 --- .../advs-module/resources/lang/de/setting.php | 3 --- .../advs-module/resources/lang/el/setting.php | 3 --- .../advs-module/resources/lang/en/setting.php | 3 --- .../advs-module/resources/lang/es/setting.php | 3 --- .../advs-module/resources/lang/fa/setting.php | 3 --- .../advs-module/resources/lang/fi/setting.php | 3 --- .../advs-module/resources/lang/fr/setting.php | 3 --- .../advs-module/resources/lang/he/setting.php | 3 --- .../advs-module/resources/lang/hi/setting.php | 3 --- .../advs-module/resources/lang/hu/setting.php | 3 --- .../advs-module/resources/lang/id/setting.php | 3 --- .../advs-module/resources/lang/it/setting.php | 3 --- .../advs-module/resources/lang/ja/setting.php | 3 --- .../advs-module/resources/lang/ko/setting.php | 3 --- .../advs-module/resources/lang/ku/setting.php | 3 --- .../advs-module/resources/lang/nl/setting.php | 3 --- .../advs-module/resources/lang/no/setting.php | 3 --- .../advs-module/resources/lang/pl/setting.php | 3 --- .../advs-module/resources/lang/pt/setting.php | 11 ++++------- .../advs-module/resources/lang/ro/setting.php | 3 --- .../advs-module/resources/lang/ru/setting.php | 3 --- .../advs-module/resources/lang/sq/setting.php | 3 --- .../advs-module/resources/lang/sr/setting.php | 3 --- .../advs-module/resources/lang/sv/setting.php | 3 --- .../advs-module/resources/lang/tr/setting.php | 3 --- .../advs-module/resources/lang/uk/setting.php | 3 --- .../advs-module/resources/lang/ur/setting.php | 3 --- .../advs-module/resources/lang/vi/setting.php | 3 --- .../advs-module/resources/lang/zh/setting.php | 3 --- app/Exceptions/ExceptionHandler.php | 2 +- 41 files changed, 9 insertions(+), 119 deletions(-) diff --git a/.env_demo b/.env_demo index 1b50a89cc..4547c462b 100644 --- a/.env_demo +++ b/.env_demo @@ -64,4 +64,7 @@ ADV_WATERMARK_TYPE="text" ADV_WATERMARK_TEXT="openclassify.com" ADV_WATERMARK_POSITION="top-right" ADV_WATERMARK_OPACITY=80 -ADV_ENABLED_CURRENCIES='a:1:{i:0;s:3:"USD";}' \ No newline at end of file +ADV_ENABLED_CURRENCIES='a:1:{i:0;s:3:"USD";}' + + +ENABLE_SENTRY_LARAVEL=true 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 247210f87..ba1dba8a1 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,6 @@ return [ 'hide_price_categories', 'tcmb_exchange_url', 'enabled_currencies', - 'disable_sentry', 'hide_ad_cat', ], ], 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 83a75233d..f41135af8 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php @@ -430,7 +430,6 @@ return [ 'default_value' => false, ] ], - 'disable_sentry' => 'anomaly.field_type.boolean', 'detailed_product_options' => [ 'type' => 'anomaly.field_type.boolean', 'config' => [ diff --git a/addons/default/visiosoft/advs-module/resources/lang/af/setting.php b/addons/default/visiosoft/advs-module/resources/lang/af/setting.php index b2c20052a..16d7765f7 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/af/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/af/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'KRY Kategorieë', 'instructions' => 'Dit verteenwoordig die kategorieë waarin die GET-eiendom geldig sal wees.' ], - 'disable_sentry' => [ - 'name' => 'Skakel wagwag uit' - ], 'watermark' => [ 'name' => 'Watermerk', 'instructions' => 'Is watermerk aktief?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/ar/setting.php b/addons/default/visiosoft/advs-module/resources/lang/ar/setting.php index d7f4a4acb..0b45ebff8 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ar/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ar/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'فئات GET', 'instructions' => 'إنه يمثل الفئات التي ستكون فيها خاصية GET صالحة.' ], - 'disable_sentry' => [ - 'name' => 'تعطيل الحارس' - ], 'watermark' => [ 'name' => 'علامة مائية', 'instructions' => 'هل العلامة المائية نشطة؟' diff --git a/addons/default/visiosoft/advs-module/resources/lang/az/setting.php b/addons/default/visiosoft/advs-module/resources/lang/az/setting.php index 9b869e941..7d5c66361 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/az/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/az/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'Kateqoriyalar alın', 'instructions' => 'GET mülkiyyətinin etibarlı olacağı kateqoriyanı təmsil edir.' ], - 'disable_sentry' => [ - 'name' => 'Nöqtəni deaktiv edin' - ], 'watermark' => [ 'name' => 'Filigran', 'instructions' => 'Filigran aktivdir?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/bg/setting.php b/addons/default/visiosoft/advs-module/resources/lang/bg/setting.php index d546186c4..d61d4acae 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/bg/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/bg/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'ВЗЕМЕТЕ Категории', 'instructions' => 'Той представлява категориите, в които свойството GET ще бъде валидно.' ], - 'disable_sentry' => [ - 'name' => 'Деактивирайте Sentry' - ], 'watermark' => [ 'name' => 'Воден знак', 'instructions' => 'Активен ли е водният знак?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/bn/setting.php b/addons/default/visiosoft/advs-module/resources/lang/bn/setting.php index 9de4e6bcb..c46e1c418 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/bn/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/bn/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'GET বিভাগসমূহ', 'instructions' => 'এটি এমন বিভাগগুলিতে প্রতিনিধিত্ব করে যেখানে জিইটি সম্পত্তি বৈধ হবে।' ], - 'disable_sentry' => [ - 'name' => 'সেন্ট্রি অক্ষম করুন' - ], 'watermark' => [ 'name' => 'ওয়াটারমার্ক', 'instructions' => 'জলছবি সক্রিয়?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/ca/setting.php b/addons/default/visiosoft/advs-module/resources/lang/ca/setting.php index 5a0f50463..f530e3fe5 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ca/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ca/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'GET Categories', 'instructions' => 'Representa les categories en què la propietat GET serà vàlida.' ], - 'disable_sentry' => [ - 'name' => 'Desactiva Sentry' - ], 'watermark' => [ 'name' => 'Filigrana', 'instructions' => 'La filigrana està activa?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/cs/setting.php b/addons/default/visiosoft/advs-module/resources/lang/cs/setting.php index b95b40c6b..713cb661b 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/cs/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/cs/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'ZÍSKEJTE kategorie', 'instructions' => 'Představuje kategorie, ve kterých bude vlastnost GET platná.' ], - 'disable_sentry' => [ - 'name' => 'Zakázat Sentry' - ], 'watermark' => [ 'name' => 'Vodoznak', 'instructions' => 'Je vodoznak aktivní?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/da/setting.php b/addons/default/visiosoft/advs-module/resources/lang/da/setting.php index dde5daf0b..fbf77a8d9 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/da/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/da/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'FÅ kategorier', 'instructions' => 'Det repræsenterer de kategorier, hvor GET-ejendommen er gyldig.' ], - 'disable_sentry' => [ - 'name' => 'Deaktiver vagtpost' - ], 'watermark' => [ 'name' => 'Vandmærke', 'instructions' => 'Er vandmærke aktivt?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/de/setting.php b/addons/default/visiosoft/advs-module/resources/lang/de/setting.php index a4fdbd1fe..bea14cc54 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/de/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/de/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'Kategorien abrufen', 'instructions' => 'Es stellt die Kategorien dar, in denen die GET-Eigenschaft gültig ist.' ], - 'disable_sentry' => [ - 'name' => 'Sentry deaktivieren' - ], 'watermark' => [ 'name' => 'Wasserzeichen', 'instructions' => 'Ist das Wasserzeichen aktiv?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/el/setting.php b/addons/default/visiosoft/advs-module/resources/lang/el/setting.php index 743734f11..fa85e38a6 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/el/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/el/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'GET Κατηγορίες', 'instructions' => 'Αντιπροσωπεύει τις κατηγορίες στις οποίες η ιδιότητα GET θα είναι έγκυρη.' ], - 'disable_sentry' => [ - 'name' => 'Απενεργοποιήστε το Sentry' - ], 'watermark' => [ 'name' => 'Στάθμη ύδατος', 'instructions' => 'Είναι ενεργό το υδατογράφημα;' 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 fbe003c58..4dbae9fc8 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'GET Categories', 'instructions' => 'It represents the categories in which the GET property will be valid.' ], - 'disable_sentry' => [ - 'name' => 'Disable Sentry' - ], 'watermark' => [ 'name' => 'Watermark', 'instructions' => 'Is watermark active?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/es/setting.php b/addons/default/visiosoft/advs-module/resources/lang/es/setting.php index 3c7fa0e84..f0ef2bfc7 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/es/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/es/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'OBTENER Categorías', 'instructions' => 'Representa las categorías en las que será válida la propiedad GET.' ], - 'disable_sentry' => [ - 'name' => 'Desactivar centinela' - ], 'watermark' => [ 'name' => 'Filigrana', 'instructions' => '¿Está activa la marca de agua?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/fa/setting.php b/addons/default/visiosoft/advs-module/resources/lang/fa/setting.php index a3be0dd07..51edde546 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/fa/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/fa/setting.php @@ -255,9 +255,6 @@ return [ 'name' => 'دسته ها را دریافت کنید', 'instructions' => 'این نشان دهنده دسته هایی است که ویژگی GET در آنها معتبر خواهد بود.' ], - 'disable_sentry' => [ - 'name' => 'Sentry را غیرفعال کنید' - ], 'watermark' => [ 'name' => 'علامت', 'instructions' => 'آیا علامت علامت فعال است؟' diff --git a/addons/default/visiosoft/advs-module/resources/lang/fi/setting.php b/addons/default/visiosoft/advs-module/resources/lang/fi/setting.php index 05b3b83f2..7d0a6b3ac 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/fi/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/fi/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'HANKI luokkia', 'instructions' => 'Se edustaa luokkia, joissa GET-ominaisuus on voimassa.' ], - 'disable_sentry' => [ - 'name' => 'Poista Sentry käytöstä' - ], 'watermark' => [ 'name' => 'Vesileima', 'instructions' => 'Onko vesileima aktiivinen?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/fr/setting.php b/addons/default/visiosoft/advs-module/resources/lang/fr/setting.php index 182c3102b..0a98a1d5f 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/fr/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/fr/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'OBTENIR Catégories', 'instructions' => 'Il représente les catégories dans lesquelles la propriété GET sera valide.' ], - 'disable_sentry' => [ - 'name' => 'Désactiver Sentry' - ], 'watermark' => [ 'name' => 'Filigrane', 'instructions' => 'Le filigrane est-il actif?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/he/setting.php b/addons/default/visiosoft/advs-module/resources/lang/he/setting.php index 3920b36ee..1a545db4d 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/he/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/he/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'קבל קטגוריות', 'instructions' => 'הוא מייצג את הקטגוריות בהן נכס ה- GET יהיה תקף.' ], - 'disable_sentry' => [ - 'name' => 'השבת זקיף' - ], 'watermark' => [ 'name' => 'סימן מים', 'instructions' => 'האם סימן מים פעיל?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/hi/setting.php b/addons/default/visiosoft/advs-module/resources/lang/hi/setting.php index d18023319..47da41eec 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/hi/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/hi/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'श्रेणियाँ प्राप्त करें', 'instructions' => 'यह उन श्रेणियों का प्रतिनिधित्व करता है जिनमें GET संपत्ति मान्य होगी।' ], - 'disable_sentry' => [ - 'name' => 'संतरी अक्षम करें' - ], 'watermark' => [ 'name' => 'वाटर-मार्क', 'instructions' => 'क्या वॉटरमार्क सक्रिय है?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/hu/setting.php b/addons/default/visiosoft/advs-module/resources/lang/hu/setting.php index f98e4010e..eb5987587 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/hu/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/hu/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'GET Kategóriák', 'instructions' => 'Azokat a kategóriákat képviseli, amelyekben a GET tulajdonság érvényes lesz.' ], - 'disable_sentry' => [ - 'name' => 'Letiltja a Sentry szolgáltatást' - ], 'watermark' => [ 'name' => 'Vízjel', 'instructions' => 'A vízjel aktív?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/id/setting.php b/addons/default/visiosoft/advs-module/resources/lang/id/setting.php index b1b6c4515..10fd546f3 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/id/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/id/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'DAPATKAN Kategori', 'instructions' => 'Ini mewakili kategori di mana properti GET akan berlaku.' ], - 'disable_sentry' => [ - 'name' => 'Nonaktifkan Sentry' - ], 'watermark' => [ 'name' => 'Tanda air', 'instructions' => 'Apakah watermark aktif?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/it/setting.php b/addons/default/visiosoft/advs-module/resources/lang/it/setting.php index eae73b60d..8ee3fbaae 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/it/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/it/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'OTTIENI Categorie', 'instructions' => 'Rappresenta le categorie in cui sarà valida la proprietà GET.' ], - 'disable_sentry' => [ - 'name' => 'Disabilita Sentry' - ], 'watermark' => [ 'name' => 'Filigrana', 'instructions' => 'La filigrana è attiva?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/ja/setting.php b/addons/default/visiosoft/advs-module/resources/lang/ja/setting.php index 3be54f676..d9ac1b1dd 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ja/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ja/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'カテゴリを取得', 'instructions' => 'これは、GETプロパティが有効になるカテゴリを表します。' ], - 'disable_sentry' => [ - 'name' => 'セントリーを無効にする' - ], 'watermark' => [ 'name' => '透かし', 'instructions' => '透かしはアクティブですか？' diff --git a/addons/default/visiosoft/advs-module/resources/lang/ko/setting.php b/addons/default/visiosoft/advs-module/resources/lang/ko/setting.php index 7b374adbc..c8ce6ca2b 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ko/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ko/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'GET 카테고리', 'instructions' => 'GET 속성이 유효한 범주를 나타냅니다.' ], - 'disable_sentry' => [ - 'name' => '센트리 비활성화' - ], 'watermark' => [ 'name' => '양수표', 'instructions' => '워터 마크가 활성화되어 있습니까?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/ku/setting.php b/addons/default/visiosoft/advs-module/resources/lang/ku/setting.php index 0334cbebe..94f1e18d2 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ku/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ku/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'Kategoriyan bistînin', 'instructions' => 'Ew kategoriyên ku tê de taybetmendiya GET dê derbasdar be temsîl dike.' ], - 'disable_sentry' => [ - 'name' => 'Sentry Disable' - ], 'watermark' => [ 'name' => 'Watermark', 'instructions' => 'Watermark çalak e?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/nl/setting.php b/addons/default/visiosoft/advs-module/resources/lang/nl/setting.php index ef02292c1..bedabb8a2 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/nl/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/nl/setting.php @@ -254,9 +254,6 @@ zullen niet zichtbaar zijn en ontzegt u van het bedrijfslidmaatschap.' 'name' => 'GET Categorieën', 'instructions' => 'Het vertegenwoordigt de categorieën waarin de eigenschap GET geldig zal zijn.' ], - 'disable_sentry' => [ - 'name' => 'Schakel Sentry uit' - ], 'watermark' => [ 'name' => 'Watermerk', 'instructions' => 'Is watermerk actief?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/no/setting.php b/addons/default/visiosoft/advs-module/resources/lang/no/setting.php index 7b1433d14..49142f7c8 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/no/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/no/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'FÅ kategorier', 'instructions' => 'Den representerer kategoriene der GET-egenskapen vil være gyldig.' ], - 'disable_sentry' => [ - 'name' => 'Deaktiver vaktpost' - ], 'watermark' => [ 'name' => 'Vannmerke', 'instructions' => 'Er vannmerke aktivt?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/pl/setting.php b/addons/default/visiosoft/advs-module/resources/lang/pl/setting.php index cc779c6d0..c6ec6dc98 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/pl/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/pl/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'POBIERZ kategorie', 'instructions' => 'Reprezentuje kategorie, w których właściwość GET będzie ważna.' ], - 'disable_sentry' => [ - 'name' => 'Wyłącz Sentry' - ], 'watermark' => [ 'name' => 'znak wodny', 'instructions' => 'Czy znak wodny jest aktywny?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/pt/setting.php b/addons/default/visiosoft/advs-module/resources/lang/pt/setting.php index 97075911a..c79253323 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/pt/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/pt/setting.php @@ -192,16 +192,16 @@ return [ 'name' => 'Altura da tela da imagem', ], 'watermark_type' => [ - 'name' => 'Tipo de marca d\\'água', + 'name' => 'Tipo de marca d\'água', ], 'watermark_text' => [ - 'name' => 'Texto de marca d\\'água', + 'name' => 'Texto de marca d\'água', ], 'watermark_image' => [ - 'name' => 'Imagem de marca d\\'água', + 'name' => 'Imagem de marca d\'água', ], 'watermark_position' => [ - 'name' => 'Posição da marca d\\'água', + 'name' => 'Posição da marca d\'água', ], 'user_filter_limit' => [ 'name' => 'Limite de filtro de usuário', @@ -254,9 +254,6 @@ return [ 'name' => 'GET Categorias', 'instructions' => 'Representa as categorias nas quais a propriedade GET será válida.' ], - 'disable_sentry' => [ - 'name' => 'Desativar Sentinela' - ], 'watermark' => [ 'name' => 'Marca d\'água', 'instructions' => 'A marca d\'água está ativa?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/ro/setting.php b/addons/default/visiosoft/advs-module/resources/lang/ro/setting.php index ac1f8574e..e60e1954a 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ro/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ro/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'GET Categorii', 'instructions' => 'Reprezintă categoriile în care proprietatea GET va fi validă.' ], - 'disable_sentry' => [ - 'name' => 'Dezactivați Sentinela' - ], 'watermark' => [ 'name' => 'Filigran', 'instructions' => 'Filigranul este activ?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/ru/setting.php b/addons/default/visiosoft/advs-module/resources/lang/ru/setting.php index 58a39e4fa..73a3bccb4 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ru/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ru/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'Получить Категории', 'instructions' => 'Он представляет категории, в которых будет действовать свойство GET.' ], - 'disable_sentry' => [ - 'name' => 'Отключить Sentry' - ], 'watermark' => [ 'name' => 'Водяной знак', 'instructions' => 'Водяной знак активен?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/sq/setting.php b/addons/default/visiosoft/advs-module/resources/lang/sq/setting.php index da23d63f6..e08fac988 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/sq/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/sq/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'GET Kategoritë', 'instructions' => 'Ai përfaqëson kategoritë në të cilat prona GET do të jetë e vlefshme.' ], - 'disable_sentry' => [ - 'name' => 'Çaktivizo rojet' - ], 'watermark' => [ 'name' => 'Filigranë', 'instructions' => 'A është ujëra aktive?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/sr/setting.php b/addons/default/visiosoft/advs-module/resources/lang/sr/setting.php index f7af8bfa6..9c521afa3 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/sr/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/sr/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'GET Kategorije', 'instructions' => 'Predstavlja kategorije u kojima će GET svojstvo biti važeće.' ], - 'disable_sentry' => [ - 'name' => 'Isključite Sentry' - ], 'watermark' => [ 'name' => 'Vodeni žig', 'instructions' => 'Da li je aktivan vodeni žig?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/sv/setting.php b/addons/default/visiosoft/advs-module/resources/lang/sv/setting.php index 31ef27793..9b38b2380 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/sv/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/sv/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'Hämta kategorier', 'instructions' => 'Det representerar de kategorier i vilka GET-egenskapen är giltig.' ], - 'disable_sentry' => [ - 'name' => 'Inaktivera vaktpost' - ], 'watermark' => [ 'name' => 'Vattenstämpel', 'instructions' => 'Är vattenstämpel aktivt?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php b/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php index 48dd987bd..2d6724837 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'GET Kategorileri', 'instructions' => 'GET özelliğinin geçerli olacağı kategorileri temsil eder.' ], - 'disable_sentry' => [ - 'name' => 'Sentry\'yi devre dışı bırak' - ], 'watermark' => [ 'name' => 'Filigran', 'instructions' => 'Filigran etkin mi?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/uk/setting.php b/addons/default/visiosoft/advs-module/resources/lang/uk/setting.php index a26eb9a65..3939d0653 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/uk/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/uk/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'ОТРИМАТИ Категорії', 'instructions' => 'Він представляє категорії, в яких буде дійсним властивість GET.' ], - 'disable_sentry' => [ - 'name' => 'Вимкнути Sentry' - ], 'watermark' => [ 'name' => 'Водяний знак', 'instructions' => 'Активний водяний знак?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/ur/setting.php b/addons/default/visiosoft/advs-module/resources/lang/ur/setting.php index 1787691aa..5862c2ce9 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ur/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ur/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'زمرہ جات حاصل کریں', 'instructions' => 'یہ ان زمروں کی نمائندگی کرتا ہے جن میں جی ای ٹی پراپرٹی درست ہوگی۔' ], - 'disable_sentry' => [ - 'name' => 'سینٹری کو غیر فعال کریں' - ], 'watermark' => [ 'name' => 'واٹر مارک', 'instructions' => 'کیا واٹر مارک سرگرم ہے؟' diff --git a/addons/default/visiosoft/advs-module/resources/lang/vi/setting.php b/addons/default/visiosoft/advs-module/resources/lang/vi/setting.php index dd9b1b4ae..5efd56222 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/vi/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/vi/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'NHẬN danh mục', 'instructions' => 'Nó đại diện cho các danh mục mà thuộc tính GET sẽ hợp lệ.' ], - 'disable_sentry' => [ - 'name' => 'Tắt Sentry' - ], 'watermark' => [ 'name' => 'Chữ ký ảnh', 'instructions' => 'Hình mờ có hoạt động không?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/zh/setting.php b/addons/default/visiosoft/advs-module/resources/lang/zh/setting.php index cd08c5c6f..6a449e90b 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/zh/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/zh/setting.php @@ -254,9 +254,6 @@ return [ 'name' => '获取类别', 'instructions' => '它代表GET属性将在其中有效的类别。' ], - 'disable_sentry' => [ - 'name' => '禁用哨兵' - ], 'watermark' => [ 'name' => '水印', 'instructions' => '水印活跃吗？' diff --git a/app/Exceptions/ExceptionHandler.php b/app/Exceptions/ExceptionHandler.php index 898f1e84b..83b60ec9c 100644 --- a/app/Exceptions/ExceptionHandler.php +++ b/app/Exceptions/ExceptionHandler.php @@ -75,7 +75,7 @@ class ExceptionHandler extends Handler if (app()->bound('sentry') && $this->shouldReport($e) && env('SENTRY_LARAVEL_DSN')) { - if (!setting_value('visiosoft.module.advs::disable_sentry')) { + if (env('ENABLE_SENTRY_LARAVEL',true)) { app('sentry')->captureException($e); } } From 5abafcc3248d2a6b4e398893159fa8fbcd338135 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 16 Jul 2021 15:25:04 +0300 Subject: [PATCH 07/23] #4345 language flag and warning for new posting --- addons/default/visiosoft/advs-module/resources/lang/tr/field.php | 1 + 1 file changed, 1 insertion(+) 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 685b20529..015ef348a 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/tr/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/tr/field.php @@ -386,5 +386,6 @@ return [ ], 'name_a_z' => 'İlan Başlığı (A\'dan Z\'ye)', 'name_z_a' => 'İlan Başlığı (Z\'den A\'ya)', + 'select_lang_ads' => 'İlan dilini seçiniz', ]; From 7d9088be71e5162a3c4d5e13cd29d1385187abbe Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 19 Jul 2021 16:23:22 +0300 Subject: [PATCH 08/23] fixed cors --- composer.json | 3 ++- config/app.php | 1 + config/cors.php | 14 ++++++++------ config/streams.php | 4 +++- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index e7cb719fc..a3a892de4 100644 --- a/composer.json +++ b/composer.json @@ -84,7 +84,8 @@ "pusher/pusher-php-server": "^5.0", "simplepie/simplepie": "^1.5.0", "guzzlehttp/guzzle": "^7.3", - "visiosoft/connect-module": "^1.0" + "visiosoft/connect-module": "^1.0", + "fruitcake/laravel-cors": "^2.0" }, "replace": { "anomaly/streams-platform": "*" diff --git a/config/app.php b/config/app.php index 669168482..18cb9f7ad 100644 --- a/config/app.php +++ b/config/app.php @@ -213,6 +213,7 @@ return [ */ Anomaly\Streams\Platform\StreamsServiceProvider::class, Sentry\Laravel\ServiceProvider::class, + \Fruitcake\Cors\CorsServiceProvider::class ], diff --git a/config/cors.php b/config/cors.php index 598b61a86..684f5e8aa 100644 --- a/config/cors.php +++ b/config/cors.php @@ -12,11 +12,13 @@ return [ | */ - 'supportsCredentials' => false, - 'allowedOrigins' => ['*'],// ex: ['abc.com', 'api.abc.com'] - 'allowedHeaders' => ['*'], - 'allowedMethods' => ['*'],// ex: ['GET', 'POST', 'PUT', 'DELETE'] - 'exposedHeaders' => [], - 'maxAge' => 0, + 'paths' => ['*'], + 'allowed_methods' => ['*'], + 'allowed_origins' => ['*'], + 'allowed_origins_patterns' => [], + 'allowed_headers' => ['*'], + 'exposed_headers' => false, + 'max_age' => false, + 'supports_credentials' => false, ]; \ No newline at end of file diff --git a/config/streams.php b/config/streams.php index 7add737bb..56fdcff0e 100644 --- a/config/streams.php +++ b/config/streams.php @@ -90,7 +90,9 @@ return [ | */ - 'middleware' => [], + 'middleware' => [ + \Fruitcake\Cors\HandleCors::class, # this line + ], /* |-------------------------------------------------------------------------- From 46a1c2b34c4ddbddb76cabf2338c9b66b71ba311 Mon Sep 17 00:00:00 2001 From: Fatih Alp Date: Tue, 27 Jul 2021 13:00:26 +0300 Subject: [PATCH 09/23] Update settings.php --- .../visiosoft/advs-module/resources/config/settings/settings.php | 1 - 1 file changed, 1 deletion(-) 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 83a75233d..f41135af8 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php @@ -430,7 +430,6 @@ return [ 'default_value' => false, ] ], - 'disable_sentry' => 'anomaly.field_type.boolean', 'detailed_product_options' => [ 'type' => 'anomaly.field_type.boolean', 'config' => [ From ae429632fc0b74ace82245eac4fa09f2ea9f5dcc Mon Sep 17 00:00:00 2001 From: vedatakd Date: Wed, 28 Jul 2021 10:01:47 +0300 Subject: [PATCH 10/23] added sentry config --- app/Exceptions/ExceptionHandler.php | 2 +- config/sentry.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Exceptions/ExceptionHandler.php b/app/Exceptions/ExceptionHandler.php index 83b60ec9c..568b8a798 100644 --- a/app/Exceptions/ExceptionHandler.php +++ b/app/Exceptions/ExceptionHandler.php @@ -75,7 +75,7 @@ class ExceptionHandler extends Handler if (app()->bound('sentry') && $this->shouldReport($e) && env('SENTRY_LARAVEL_DSN')) { - if (env('ENABLE_SENTRY_LARAVEL',true)) { + if (config('sentry.enable_sentry_laravel')) { app('sentry')->captureException($e); } } diff --git a/config/sentry.php b/config/sentry.php index bd95322af..52cabdb04 100644 --- a/config/sentry.php +++ b/config/sentry.php @@ -33,4 +33,5 @@ return [ 'controllers_base_namespace' => env('SENTRY_CONTROLLERS_BASE_NAMESPACE', 'App\\Http\\Controllers'), + 'enable_sentry_laravel' => env('ENABLE_SENTRY_LARAVEL',true), ]; From 73ecbf856971ff04c088f8138818a3be4b81a8a0 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Wed, 28 Jul 2021 10:11:56 +0300 Subject: [PATCH 11/23] fixed --- app/Exceptions/ExceptionHandler.php | 2 +- config/app.php | 2 ++ config/sentry.php | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Exceptions/ExceptionHandler.php b/app/Exceptions/ExceptionHandler.php index 568b8a798..3e939632e 100644 --- a/app/Exceptions/ExceptionHandler.php +++ b/app/Exceptions/ExceptionHandler.php @@ -75,7 +75,7 @@ class ExceptionHandler extends Handler if (app()->bound('sentry') && $this->shouldReport($e) && env('SENTRY_LARAVEL_DSN')) { - if (config('sentry.enable_sentry_laravel')) { + if (config('app.enable_sentry_laravel')) { app('sentry')->captureException($e); } } diff --git a/config/app.php b/config/app.php index 18cb9f7ad..40b4bf058 100644 --- a/config/app.php +++ b/config/app.php @@ -270,4 +270,6 @@ return [ ], + 'enable_sentry_laravel' => env('ENABLE_SENTRY_LARAVEL',true), + ]; diff --git a/config/sentry.php b/config/sentry.php index 52cabdb04..5cad88d2d 100644 --- a/config/sentry.php +++ b/config/sentry.php @@ -32,6 +32,4 @@ return [ 'traces_sample_rate' => (float)(env('SENTRY_TRACES_SAMPLE_RATE', 1)), 'controllers_base_namespace' => env('SENTRY_CONTROLLERS_BASE_NAMESPACE', 'App\\Http\\Controllers'), - - 'enable_sentry_laravel' => env('ENABLE_SENTRY_LARAVEL',true), ]; From 3bfbb078377875f0649142e9d0d2aaad407aa56b Mon Sep 17 00:00:00 2001 From: vedatakd Date: Wed, 28 Jul 2021 13:51:21 +0300 Subject: [PATCH 12/23] fixed laravel cors --- .../visiosoft/advs-module/composer.json | 23 +++++++++++-------- composer.json | 3 +-- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/addons/default/visiosoft/advs-module/composer.json b/addons/default/visiosoft/advs-module/composer.json index bb6a02f5d..a028944ee 100644 --- a/addons/default/visiosoft/advs-module/composer.json +++ b/addons/default/visiosoft/advs-module/composer.json @@ -1,12 +1,15 @@ { - "name": "visiosoft/advs-module", - "type": "streams-addon", - "autoload": { - "psr-4": { - "Visiosoft\\AdvsModule\\": "src/" - }, - "files": [ - "src/Support/_helpers.php" - ] - } + "name": "visiosoft/advs-module", + "type": "streams-addon", + "autoload": { + "psr-4": { + "Visiosoft\\AdvsModule\\": "src/" + }, + "files": [ + "src/Support/_helpers.php" + ] + }, + "require": { + "fruitcake/laravel-cors": "^2.0" + } } diff --git a/composer.json b/composer.json index a3a892de4..e7cb719fc 100644 --- a/composer.json +++ b/composer.json @@ -84,8 +84,7 @@ "pusher/pusher-php-server": "^5.0", "simplepie/simplepie": "^1.5.0", "guzzlehttp/guzzle": "^7.3", - "visiosoft/connect-module": "^1.0", - "fruitcake/laravel-cors": "^2.0" + "visiosoft/connect-module": "^1.0" }, "replace": { "anomaly/streams-platform": "*" From a33b5713fcdf884a48e99289622f96f5e7015dbf Mon Sep 17 00:00:00 2001 From: vedatakd Date: Wed, 28 Jul 2021 15:11:34 +0300 Subject: [PATCH 13/23] remove config --- app/Exceptions/ExceptionHandler.php | 23 +++++++++++------------ config/app.php | 3 --- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/app/Exceptions/ExceptionHandler.php b/app/Exceptions/ExceptionHandler.php index 3e939632e..f7522c175 100644 --- a/app/Exceptions/ExceptionHandler.php +++ b/app/Exceptions/ExceptionHandler.php @@ -53,10 +53,10 @@ class ExceptionHandler extends Handler $summary = $e->getMessage(); $headers = $e->getHeaders(); - $code = $e->getStatusCode(); - $name = trans("streams::error.{$code}.name"); + $code = $e->getStatusCode(); + $name = trans("streams::error.{$code}.name"); $message = trans("streams::error.{$code}.message"); - $id = $this->container->make(ExceptionIdentifier::class)->identify($this->original); + $id = $this->container->make(ExceptionIdentifier::class)->identify($this->original); if (view()->exists($view = "streams::errors/{$code}")) { return response()->view($view, compact('id', 'code', 'name', 'message', 'summary'), $code, $headers); @@ -72,12 +72,11 @@ class ExceptionHandler extends Handler public function report(Throwable $e) { - if (app()->bound('sentry') - && $this->shouldReport($e) - && env('SENTRY_LARAVEL_DSN')) { - if (config('app.enable_sentry_laravel')) { - app('sentry')->captureException($e); - } + if (app()->bound('sentry') && + $this->shouldReport($e) && + env('SENTRY_LARAVEL_DSN') && + !empty(env('SENTRY_LARAVEL_DSN'))) { + app('sentry')->captureException($e); } if ($e instanceof Swift_TransportException) { @@ -92,9 +91,9 @@ class ExceptionHandler extends Handler try { return array_filter( [ - 'user' => Auth::id(), - 'email' => Auth::user() ? Auth::user()->email : null, - 'url' => request() ? request()->fullUrl() : null, + 'user' => Auth::id(), + 'email' => Auth::user() ? Auth::user()->email : null, + 'url' => request() ? request()->fullUrl() : null, 'identifier' => $this->container->make(ExceptionIdentifier::class)->identify($this->original), ] ); diff --git a/config/app.php b/config/app.php index 40b4bf058..c8c483477 100644 --- a/config/app.php +++ b/config/app.php @@ -269,7 +269,4 @@ return [ ], - - 'enable_sentry_laravel' => env('ENABLE_SENTRY_LARAVEL',true), - ]; From 9be8a7586b84df820e016da3cc99b9f1e37b64b6 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Fri, 30 Jul 2021 09:51:37 +0300 Subject: [PATCH 14/23] fixed fr lang error --- .../resources/lang/fr/button.php | 2 +- .../resources/lang/fr/field.php | 30 +++++++++---------- .../resources/lang/fr/message.php | 10 +++---- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/addons/default/visiosoft/profile-module/resources/lang/fr/button.php b/addons/default/visiosoft/profile-module/resources/lang/fr/button.php index f58805476..814d23018 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/fr/button.php +++ b/addons/default/visiosoft/profile-module/resources/lang/fr/button.php @@ -3,7 +3,7 @@ return [ 'new_profile' => 'Nouveau profile', 'new_adress' => 'Nouvelle adresse', - 'show' => 'Afficher l\\'adresse', + 'show' => 'Afficher l\'adresse', 'update_password' => 'Mettre à jour le mot de passe', 'update_profile' => 'Mettre à jour le profil', 'delete' => 'Supprimer', diff --git a/addons/default/visiosoft/profile-module/resources/lang/fr/field.php b/addons/default/visiosoft/profile-module/resources/lang/fr/field.php index e2dbf9a6e..89afd76f6 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/fr/field.php +++ b/addons/default/visiosoft/profile-module/resources/lang/fr/field.php @@ -11,7 +11,7 @@ return [ 'name' => 'Nom de famille' ], 'username' => [ - 'name' => 'Nom d\\'utilisateur' + 'name' => 'Nom d\'utilisateur' ], 'display_name' => [ 'name' => 'Afficher un nom' @@ -26,7 +26,7 @@ return [ 'name' => 'Utilisateur actif' ], 'enabled' => [ - 'name' => 'Activer l\\'utilisateur' + 'name' => 'Activer l\'utilisateur' ], 'country' => [ 'name' => 'Pays' @@ -74,10 +74,10 @@ return [ 'name' => 'Profession' ], 'identification_number' => [ - 'name' => 'Numéro d\\'identification' + 'name' => 'Numéro d\'identification' ], 'adress_name' => [ - 'name' => 'Nom de l\\'adresse' + 'name' => 'Nom de l\'adresse' ], 'adress_first_name' => [ 'name' => 'Prénom' @@ -89,7 +89,7 @@ return [ 'name' => 'actes' ], 'adress_content' => [ - 'name' => 'Contenu de l\\'adresse' + 'name' => 'Contenu de l\'adresse' ], 'adress_post_code' => [ 'name' => 'Code postal' @@ -176,7 +176,7 @@ return [ 'name' => 'Mes forfaits' ], 'menu_adv_packages' => [ - 'name' => 'Forfaits d\\'annonces' + 'name' => 'Forfaits d\'annonces' ], 'menu_time_packages' => [ 'name' => 'Forfaits' @@ -188,7 +188,7 @@ return [ 'name' => 'Photo de profil' ], 'adv_listing_banner' => [ - 'name' => 'Bannière de la page d\\'annonces' + 'name' => 'Bannière de la page d\'annonces' ], 'approve' => [ 'name' => 'Approuver' @@ -238,7 +238,7 @@ return [ consectetur adipisicing elit' ], 'right_need_help_subject' => [ - 'name' => 'Besoin d\\'aide pour?' + 'name' => 'Besoin d\'aide pour?' ], 'right_need_help_msg' => [ 'name' => 'Donner un appel sur' @@ -325,7 +325,7 @@ return [ 'name' => 'Attendre', ], 'awaiting_dispatch' => [ - 'name' => 'En attente d\\'expédition', + 'name' => 'En attente d\'expédition', ], 'shipped' => [ 'name' => 'Expédié', @@ -346,7 +346,7 @@ return [ 'name' => 'Le résultat de la transaction sera notifié par mail.', ], 'show_order_msg2' => [ - 'name' => 'Le remboursement sera effectué si le produit n\\'est pas livré dans la semaine.', + 'name' => 'Le remboursement sera effectué si le produit n\'est pas livré dans la semaine.', ], 'show_order_msg3' => [ 'name' => 'Le résultat de la transaction a été envoyé à votre adresse e-mail enregistrée.', @@ -381,7 +381,7 @@ return [ ], 'corporate_settings' => [ - 'name' => 'Paramètres d\\'entreprise', + 'name' => 'Paramètres d\'entreprise', ], 'password' => [ 'name' => 'Mot de passe', @@ -405,7 +405,7 @@ return [ 'name' => 'Modifier l\'adresse', ], 'balance_limit' => [ - 'name' => 'Limite d\\'équilibre', + 'name' => 'Limite d\'équilibre', ], 'active_ads' => [ 'name' => 'Annonces actives', @@ -414,19 +414,19 @@ return [ 'name' => 'Abonnements', ], 'go_subscriptions_page' => [ - 'name' => 'Aller à la page d\\'abonnements', + 'name' => 'Aller à la page d\'abonnements', ], 'buy_package' => [ 'name' => 'Acheter un forfait', ], 'expired_date' => [ - 'name' => 'Date d\\'expiration', + 'name' => 'Date d\'expiration', ], 'category' => [ 'name' => 'Catégorie', ], 'ad_limit' => [ - 'name' => 'Limite d\\'annonce', + 'name' => 'Limite d\'annonce', ], 'publish_time' => [ 'name' => 'Heure de publication', diff --git a/addons/default/visiosoft/profile-module/resources/lang/fr/message.php b/addons/default/visiosoft/profile-module/resources/lang/fr/message.php index 976810ce9..620c8423d 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/fr/message.php +++ b/addons/default/visiosoft/profile-module/resources/lang/fr/message.php @@ -2,15 +2,15 @@ return [ "email" => "Le champ E-mail est obligatoire!", - "username" => "Le nom d\\'utilisateur est obligatoire!", + "username" => "Le nom d'utilisateur est obligatoire!", "success_update" => "Mise à jour du profil avec succès!", "adress_success_update" => "Adresse mise à jour avec succès!", "adress_success_create" => "Adresse Créer avec succès!", "login_error" => "Identifiant ou mot de passe incorrect.", - "login_noMail_old_user" => "L\\'adresse e-mail que vous avez entrée est introuvable.", - "login_noMail_old_user2" => "Veuillez vérifier l\\'adresse e-mail et réessayer.", + "login_noMail_old_user" => "L'adresse e-mail que vous avez entrée est introuvable.", + "login_noMail_old_user2" => "Veuillez vérifier l'adresse e-mail et réessayer.", "login_noMail_old_user3" => "Si le problème persiste, - contactez-nous à l\\'adresse info@openclassify.com.", + contactez-nous à l'adresse info@openclassify.com.", "login_info_old_user" => "Un nouveau mot de passe a été envoyé à votre adresse e-mail.", "success" => "Succès", "notified_new_updates" => "Je veux être informé des nouvelles mises à jour", @@ -18,7 +18,7 @@ return [ "receive_messages_email" => "Je veux recevoir des messages par email", "no_packages_module" => "Aucun module de paquets!", "required_add"=> "Veuillez remplir toutes les lignes requises.", - "no_extend_package" => "Aucun étendre les packages d\\'annonces", + "no_extend_package" => "Aucun étendre les packages d'annonces", "saved" => "Enregistré!", 'please_confirm_transaction' => 'Veuillez confirmer la transaction', 'password_do_not_match' => 'Les mots de passe ne correspondent pas', From 64174383b946790c16c18e80860e501d4bee9cbc Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 30 Jul 2021 16:21:16 +0300 Subject: [PATCH 15/23] #4380 ads list filter fix --- addons/default/visiosoft/advs-module/resources/js/list.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/resources/js/list.js b/addons/default/visiosoft/advs-module/resources/js/list.js index 52f1fa1f7..d7c5450d9 100644 --- a/addons/default/visiosoft/advs-module/resources/js/list.js +++ b/addons/default/visiosoft/advs-module/resources/js/list.js @@ -145,6 +145,10 @@ $(document).ready(function () { filter.checkUser(); }); + $('.filter-box>div:first-child').on('click', function () { + $(this).parent().find('div').not($(this)).first().toggleClass('d-none'); + }) + // Country filter const locationFilter = $("select[name=filter_country]") locationFilter.select2({ @@ -205,4 +209,4 @@ $("#listFilterForm, #listFilterFormMobile").submit(function (e) { // Change view type function changeViewType(viewLink) { window.location.href = viewLink -} \ No newline at end of file +} From f2d3d24334ed001cf452f975f0c0985a107c231c Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 30 Jul 2021 16:51:50 +0300 Subject: [PATCH 16/23] #4380 ads list filter fix --- addons/default/visiosoft/advs-module/resources/js/list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/resources/js/list.js b/addons/default/visiosoft/advs-module/resources/js/list.js index d7c5450d9..d26d1789f 100644 --- a/addons/default/visiosoft/advs-module/resources/js/list.js +++ b/addons/default/visiosoft/advs-module/resources/js/list.js @@ -146,7 +146,7 @@ $(document).ready(function () { }); $('.filter-box>div:first-child').on('click', function () { - $(this).parent().find('div').not($(this)).first().toggleClass('d-none'); + $(this).siblings().toggleClass('d-none'); }) // Country filter From c96801e093237e49fb4bcec6ba959ac4dfc6f4f1 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Fri, 30 Jul 2021 17:04:09 +0300 Subject: [PATCH 17/23] added filter sold --- .../resources/config/settings/sections.php | 2 +- .../resources/config/settings/settings.php | 8 +++++++- .../advs-module/resources/lang/en/setting.php | 6 +++++- .../advs-module/src/Adv/AdvRepository.php | 9 +++++++++ .../src/Http/Controller/AdvsController.php | 17 +++++++++++++++++ 5 files changed, 39 insertions(+), 3 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 ba1dba8a1..592350017 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php @@ -98,7 +98,7 @@ return [ 'title' => 'visiosoft.module.advs::section.filter', 'fields' => [ 'hide_filter_section', 'hide_price_filter', 'hide_date_filter', 'hide_photo_filter', 'hide_map_filter', - 'hide_listing_header', 'user_filter_limit', + 'hide_listing_header', 'user_filter_limit','hide_out_of_stock_products_without_listing' ], ], 'translations' => [ 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 f41135af8..0a19456b3 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php @@ -479,5 +479,11 @@ return [ 'config' => [ 'default_value' => false, ] - ] + ], + 'hide_out_of_stock_products_without_listing' => [ + '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 4dbae9fc8..d258617a8 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php @@ -286,5 +286,9 @@ return [ 'show_input_flag' => [ 'name' => 'Show Flags on Input', 'instructions' => 'Show flag and description on translatable inputs' - ] + ], + 'hide_out_of_stock_products_without_listing' => [ + 'name' => 'Hide out of stock products without listing', + 'instructions' => 'Hides out-of-stock GET products from listing and homepage' + ], ]; diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php index 988de0de8..fd1724579 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php @@ -395,6 +395,15 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface $latest_advs = $this->model->currentAds() ->limit(setting_value('visiosoft.module.advs::latest-limit')) ->get(); + + if (setting_value('visiosoft.module.advs::hide_out_of_stock_products_without_listing')) { + $latest_advs = $latest_advs->filter( + function ($entry) { + return (($entry->is_get_adv == true && $entry->stock > 0) || ($entry->is_get_adv == false)); + } + ); + } + return $this->model->getLocationNames($latest_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 5cbe78018..2989b683e 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php @@ -240,6 +240,14 @@ class AdvsController extends PublicController ), 301); } + if (setting_value('visiosoft.module.advs::hide_out_of_stock_products_without_listing')) { + $advs = $advs->filter( + function ($entry) { + return (($entry->is_get_adv == true && $entry->stock > 0) || ($entry->is_get_adv == false)); + } + ); + } + foreach ($advs as $index => $ad) { $advs[$index]->detail_url = $this->adv_model->getAdvDetailLinkByModel($ad, 'list'); $advs[$index] = $this->adv_model->AddAdsDefaultCoverImage($ad); @@ -1096,6 +1104,15 @@ class AdvsController extends PublicController $advModel = new AdvModel(); $advs = $repository->searchAdvs('map', $param, $customParameters); + + if (setting_value('visiosoft.module.advs::hide_out_of_stock_products_without_listing')) { + $advs = $advs->filter( + function ($entry) { + return (($entry->is_get_adv == true && $entry->stock > 0) || ($entry->is_get_adv == false)); + } + ); + } + foreach ($advs as $index => $ad) { $advs[$index]->seo_link = $advModel->getAdvDetailLinkByModel($ad, 'list'); $advs[$index] = $advModel->AddAdsDefaultCoverImage($ad); From 4eaf48992b5c2d0890a3d249c27ae62faac13fe9 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 2 Aug 2021 16:08:39 +0300 Subject: [PATCH 18/23] developments --- .../advs-module/resources/views/list/partials/ads.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/ads.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/ads.twig index 5763937b5..24117dca6 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/ads.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/ads.twig @@ -34,7 +34,7 @@ {{ adv.name }} + alt="{{ adv.name }}" data-src="{{ adv.thumbnail }}"> From 77ff0b09fa559305d0d2d9c8e2a11993ef794636 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Tue, 3 Aug 2021 11:05:25 +0300 Subject: [PATCH 19/23] #4061 ads configration improvments --- .../resources/css/new-create-new.scss | 27 +++++++++- .../resources/images/create/close.svg | 6 +++ .../resources/images/create/plus.svg | 12 +++++ .../advs-module/resources/js/new-create.js | 32 +++++++++++- .../advs-module/resources/lang/en/button.php | 1 + .../advs-module/resources/lang/tr/button.php | 2 + .../resources/views/new-ad/new-create.twig | 7 ++- .../new-ad/partials/configuration-modal.twig | 52 +++++++++++++++++++ .../views/new-ad/preview/preview.twig | 14 ----- .../src/Adv/Command/IsOptionsByCategory.php | 2 +- .../src/AdvsModuleServiceProvider.php | 6 +++ .../src/Http/Controller/AdvsController.php | 7 +-- .../OptionConfigurationController.php | 25 +++++++++ ...OptionConfigurationRepositoryInterface.php | 2 + .../Form/OptionConfigurationFormBuilder.php | 3 ++ .../Form/OptionConfigurationFormFields.php | 18 ++++--- .../OptionConfigurationRepository.php | 5 +- 17 files changed, 190 insertions(+), 31 deletions(-) create mode 100644 addons/default/visiosoft/advs-module/resources/images/create/close.svg create mode 100644 addons/default/visiosoft/advs-module/resources/images/create/plus.svg create mode 100644 addons/default/visiosoft/advs-module/resources/views/new-ad/partials/configuration-modal.twig diff --git a/addons/default/visiosoft/advs-module/resources/css/new-create-new.scss b/addons/default/visiosoft/advs-module/resources/css/new-create-new.scss index 9fe3ff8d5..f93008c30 100644 --- a/addons/default/visiosoft/advs-module/resources/css/new-create-new.scss +++ b/addons/default/visiosoft/advs-module/resources/css/new-create-new.scss @@ -261,4 +261,29 @@ label { } } } -} \ No newline at end of file +} + +.btn-configuration { + background-color: #6E5DDB; + padding: 1rem 2rem; + font-family: 'Poppins', sans-serif; + font-size: calc(18rem / 16); + border-radius: .25rem; + border: 0; + color: #fff; + display: inline-flex; + align-items: center; + margin-bottom: 2rem; + + &:hover, + &:active, + &:focus { + background-color: #6E5DDB; + color: #fff; + } + + svg { + width: 1.5rem; + height: auto; + } +} diff --git a/addons/default/visiosoft/advs-module/resources/images/create/close.svg b/addons/default/visiosoft/advs-module/resources/images/create/close.svg new file mode 100644 index 000000000..85882199b --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/create/close.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/addons/default/visiosoft/advs-module/resources/images/create/plus.svg b/addons/default/visiosoft/advs-module/resources/images/create/plus.svg new file mode 100644 index 000000000..dc901980f --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/create/plus.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/addons/default/visiosoft/advs-module/resources/js/new-create.js b/addons/default/visiosoft/advs-module/resources/js/new-create.js index 9166a6519..feb51dbd1 100644 --- a/addons/default/visiosoft/advs-module/resources/js/new-create.js +++ b/addons/default/visiosoft/advs-module/resources/js/new-create.js @@ -3,8 +3,6 @@ function showLoader() { } - - var filter = {}; // TODO will be unified @@ -265,4 +263,34 @@ $(document).ready(function () { return true; }) + + $('#configurationForm').submit(function (e) { + e.preventDefault(); + crudAjax($(this).serialize(), '/advs/configuration/ajax/create', 'POST', function (callback) { + $('.configuration-table').append(` + ${callback.option_name} + ${callback.stock} + ${callback.currency_price} + + + + + + + + + + `); + $('#configurationForm').trigger("reset"); + }) + }); + + $(document).on('click', '.remove-conf', function () { + const id = $(this).data('id'); + + crudAjax({id: id}, '/advs/configuration/ajax/delete', 'POST', function (callback) { + $('#configuration-' + id).remove(); + }) + }); + }); diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/button.php b/addons/default/visiosoft/advs-module/resources/lang/en/button.php index c37d791c5..d3c185309 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/button.php @@ -1,6 +1,7 @@ 'Add', 'new_adv' => 'New classified', 'new_classified' => 'New classified', 'new_category' => 'New Category', diff --git a/addons/default/visiosoft/advs-module/resources/lang/tr/button.php b/addons/default/visiosoft/advs-module/resources/lang/tr/button.php index 6902810bf..d653c135b 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/tr/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/tr/button.php @@ -1,6 +1,7 @@ 'Ekle', 'new_adv' => 'Yeni ürün/ilan', 'new_classified' => 'Yeni ürün/ilan', 'new_category' => 'Yeni kategori', @@ -33,6 +34,7 @@ return [ 'name' => 'Kategori Güncelle' ], 'new_option' => 'Yeni Seçenek', + 'options' => 'Seçenekler', 'export' => 'Dışa aktar', 'new_productoption' => 'Yeni Üretim', 'new_productoptions_value' => 'Yeni Ürün seçeneği değeri', 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 4c0f772aa..a92142253 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 @@ -225,7 +225,11 @@ {{ trans('visiosoft.module.advs::field.product_option.name') }}
- {{ form.fields.product_options_value.configSet('cat1', adv.cat1).input|raw }} +
{% endif %} @@ -316,6 +320,7 @@
{% include "visiosoft.module.advs::new-ad/partials/modals" %} + {% include "visiosoft.module.advs::new-ad/partials/configuration-modal" %} {{ addBlock('new-ad/modals')|raw }}