From efee230284c72651175d76975faf89cdba76cf17 Mon Sep 17 00:00:00 2001
From: muammertop <muammertop@outlook.com>
Date: Fri, 30 Apr 2021 16:00:36 +0300
Subject: [PATCH] fixed hide price for unauthorized users

---
 .../resources/views/ad-detail/partials/detail.twig          | 3 +--
 .../visiosoft/advs-module/resources/views/list/gallery.twig | 3 +--
 .../advs-module/resources/views/list/partials/ads.twig      | 6 ++----
 .../visiosoft/advs-module/src/Support/Command/Currency.php  | 4 +++-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/detail.twig b/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/detail.twig
index fd4d80c35..ab26ee08f 100644
--- a/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/detail.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/detail.twig
@@ -1,6 +1,5 @@
 <div class="slider-text">
-    <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 offered-field offered-row
-        {{ setting_value('visiosoft.module.advs::show_price_to_members_only') ? (not auth_check() ? 'd-none') }}">
+    <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 offered-field offered-row">
         {% set standardPrice = adv.standard_price.value %}
         {% if standardPrice and standardPrice > 0 %}
             <div class="d-flex flex-wrap align-items-center">
diff --git a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig
index f7834624e..1c1f67dce 100644
--- a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig
@@ -32,8 +32,7 @@
                             <p class="cat-data mb-1">{{ adv.cat1_name }} /{{ adv.cat2_name }}</p>
                         {% endif %}
                         {% if showPrice %}
-                            <p class="price-data mb-1
-                                    {{ setting_value('visiosoft.module.advs::show_price_to_members_only') ? (auth_check() ? false : 'd-none') }}">
+                            <p class="price-data mb-1">
                                 {{ adv.price != '0' ? currency_format(adv.price,adv.currency) : trans('visiosoft.module.advs::field.free') }}
                             </p>
                         {% endif %}
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 f0b935a49..bda048385 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
@@ -15,9 +15,7 @@
             {% if setting_value('visiosoft.module.advs::market_place') %}
                 <th class="text-nowrap">{{ trans('visiosoft.module.advs::field.listing_date') }}</th>
             {% endif %}
-            <th class="text-nowrap {{ setting_value('visiosoft.module.advs::show_price_to_members_only') ? (auth_check() ? false : 'd-none') }}">
-                {{ trans('visiosoft.module.advs::field.price.name') }}
-            </th>
+            <th class="text-nowrap">{{ trans('visiosoft.module.advs::field.price.name') }}</th>
         </tr>
         </thead>
 
@@ -58,7 +56,7 @@
                         <p>{{ adv.publish_at.value|date('Y') }}</p>
                     </td>
                 {% endif %}
-                <td class="price-data {{ setting_value('visiosoft.module.advs::show_price_to_members_only') ? (auth_check() ? false : 'd-none') }}">
+                <td class="price-data">
                     {% if not hideStandard %}
                         <p class="text-nowrap">
                             <s>
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 d7c2ac70f..f0d86c33c 100644
--- a/addons/default/visiosoft/advs-module/src/Support/Command/Currency.php
+++ b/addons/default/visiosoft/advs-module/src/Support/Command/Currency.php
@@ -48,7 +48,9 @@ class Currency
                 $decimals = 0;
             }
         }
-
+        if (setting_value('visiosoft.module.advs::show_price_to_members_only') && !auth()->check()){
+            return null;
+        }
         return $prefix . number_format($number, $decimals, $point, str_replace('&#160;', ' ', $separator)) . $suffix;
     }