From 887c19a12e83fcef7876400c875cc1f7f8fea089 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Wed, 3 Mar 2021 11:31:25 +0300 Subject: [PATCH 1/6] #3411 [references] Add image to share link to settings --- .../src/Http/Middleware/authCheck.php | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/addons/default/visiosoft/profile-module/src/Http/Middleware/authCheck.php b/addons/default/visiosoft/profile-module/src/Http/Middleware/authCheck.php index 68d10d61a..7cdb79a51 100644 --- a/addons/default/visiosoft/profile-module/src/Http/Middleware/authCheck.php +++ b/addons/default/visiosoft/profile-module/src/Http/Middleware/authCheck.php @@ -1,32 +1,40 @@ -auth = $auth; $this->request = $request; + $this->template = $template; } - /** - * @param Guard $auth - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector - */ public function handle(Request $request, Closure $next) { if ($this->auth->check()) { return redirect($this->request->get('redirect', '/')); } + + if (($ogImage = session()->get('ogImage')) && ($file = $this->dispatch(new GetFile($ogImage)))) { + $this->template->set( + 'og_image', + $file->make()->url() + ); + } + return $next($request); - } -} \ No newline at end of file + } +} From 50145c6f6c3be5f7fdcd5dbb2b6e50cdf836c62e Mon Sep 17 00:00:00 2001 From: Diatrex Date: Wed, 3 Mar 2021 16:06:16 +0300 Subject: [PATCH 2/6] fix phone number flag --- .../default/visiosoft/base-theme/resources/css/intlTelInput.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/base-theme/resources/css/intlTelInput.css b/addons/default/visiosoft/base-theme/resources/css/intlTelInput.css index eebd0d0ee..08523be6a 100644 --- a/addons/default/visiosoft/base-theme/resources/css/intlTelInput.css +++ b/addons/default/visiosoft/base-theme/resources/css/intlTelInput.css @@ -916,7 +916,7 @@ .iti__flag { height: 15px; box-shadow: 0px 0px 1px 0px #888; - background-image: url('{{ img("visiosoft.theme.base::images/flags.png").url }}'); + background-image: url('{{ img("visiosoft.theme.base::images/flags.png").path }}'); background-repeat: no-repeat; background-color: #DBDBDB; background-position: 20px 0; } From 21d41e918e12b789d4382912e2427b87d61f3f29 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Wed, 3 Mar 2021 16:22:36 +0300 Subject: [PATCH 3/6] #3411 [references] Add image to share link to settings --- .../src/Http/Middleware/OGImage.php | 31 +++++++++++++++++++ .../src/Http/Middleware/authCheck.php | 12 +------ .../src/ProfileModuleServiceProvider.php | 4 ++- 3 files changed, 35 insertions(+), 12 deletions(-) create mode 100644 addons/default/visiosoft/profile-module/src/Http/Middleware/OGImage.php diff --git a/addons/default/visiosoft/profile-module/src/Http/Middleware/OGImage.php b/addons/default/visiosoft/profile-module/src/Http/Middleware/OGImage.php new file mode 100644 index 000000000..5bc61993e --- /dev/null +++ b/addons/default/visiosoft/profile-module/src/Http/Middleware/OGImage.php @@ -0,0 +1,31 @@ +template = $template; + } + + public function handle(Request $request, Closure $next) + { + if (($ogImage = session()->get('ogImage')) && ($file = $this->dispatch(new GetFile($ogImage)))) { + $this->template->set( + 'og_image', + $file->make()->url() + ); + } + + return $next($request); + } +} diff --git a/addons/default/visiosoft/profile-module/src/Http/Middleware/authCheck.php b/addons/default/visiosoft/profile-module/src/Http/Middleware/authCheck.php index 7cdb79a51..180814d23 100644 --- a/addons/default/visiosoft/profile-module/src/Http/Middleware/authCheck.php +++ b/addons/default/visiosoft/profile-module/src/Http/Middleware/authCheck.php @@ -1,7 +1,5 @@ auth = $auth; $this->request = $request; - $this->template = $template; } public function handle(Request $request, Closure $next) @@ -28,13 +25,6 @@ class authCheck return redirect($this->request->get('redirect', '/')); } - if (($ogImage = session()->get('ogImage')) && ($file = $this->dispatch(new GetFile($ogImage)))) { - $this->template->set( - 'og_image', - $file->make()->url() - ); - } - return $next($request); } } diff --git a/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php b/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php index 476ce364a..422a476cf 100644 --- a/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php +++ b/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php @@ -15,6 +15,7 @@ use Visiosoft\ProfileModule\Education\Contract\EducationRepositoryInterface; use Visiosoft\ProfileModule\Education\EducationModel; use Visiosoft\ProfileModule\Education\EducationRepository; use Visiosoft\ProfileModule\Http\Middleware\authCheck; +use Visiosoft\ProfileModule\Http\Middleware\OGImage; use Visiosoft\ProfileModule\Profile\Password\ForgotPassFormBuilder; use Visiosoft\ProfileModule\Profile\Password\PasswordFormBuilder; use Visiosoft\ProfileModule\Profile\Profile\ProfileFormBuilder; @@ -84,7 +85,8 @@ class ProfileModuleServiceProvider extends AddonServiceProvider // RegisterController 'register' => [ 'middleware' => [ - authCheck::class + authCheck::class, + OGImage::class ], 'ttl' => 0, 'uses' => 'Anomaly\UsersModule\Http\Controller\RegisterController@register', From 676e47f99c53e29ce9590bd5b9761f68c8ad2a8f Mon Sep 17 00:00:00 2001 From: Diatrex Date: Wed, 3 Mar 2021 16:24:00 +0300 Subject: [PATCH 4/6] #3411 [references] Add image to share link to settings --- .../profile-module/src/Http/Middleware/authCheck.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/addons/default/visiosoft/profile-module/src/Http/Middleware/authCheck.php b/addons/default/visiosoft/profile-module/src/Http/Middleware/authCheck.php index 180814d23..e1e83a94a 100644 --- a/addons/default/visiosoft/profile-module/src/Http/Middleware/authCheck.php +++ b/addons/default/visiosoft/profile-module/src/Http/Middleware/authCheck.php @@ -2,16 +2,12 @@ use Closure; use Illuminate\Contracts\Auth\Guard; -use Illuminate\Foundation\Bus\DispatchesJobs; use Illuminate\Http\Request; class authCheck { - use DispatchesJobs; - private $auth; private $request; - private $template; public function __construct(Guard $auth,Request $request) { From c74b8139e320dd0a448a63983d7b668e2e560787 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Thu, 4 Mar 2021 13:30:38 +0300 Subject: [PATCH 5/6] #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 6/6] #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 @@ -
+