From 25159e9dda048819f78dfa09bec1ac49118a5f65 Mon Sep 17 00:00:00 2001
From: Alvin Johnson So <so.alvinjohnson@gmail.com>
Date: Fri, 26 Feb 2021 16:22:23 +0800
Subject: [PATCH 1/2] added option to enable or disable visitor recognition

---
 README.md                                         |  3 +++
 admin/controller/extension/module/tawkto.php      |  7 +++++--
 admin/view/template/extension/module/tawkto.tpl   | 15 +++++++++++++++
 catalog/controller/extension/module/tawkto.php    | 11 +++++++++--
 .../default/template/extension/module/tawkto.tpl  |  2 +-
 5 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 3ddf3e3..53766e2 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,9 @@ Visit our [Help Center](https://help.tawk.to/) for answers to FAQs
 
 ## Changelog
 
+### 1.4.0
+* Added enable/disable option for visitor recognition feature.
+
 ### 1.3.0
 * Added monitoring of cart item option to tawk.to module config page.
 
diff --git a/admin/controller/extension/module/tawkto.php b/admin/controller/extension/module/tawkto.php
index a4eb2a2..ae4209a 100644
--- a/admin/controller/extension/module/tawkto.php
+++ b/admin/controller/extension/module/tawkto.php
@@ -91,6 +91,7 @@ public function getDisplayOpts($store_id = 0)
                 'show_oncategory' => false,
                 'show_oncustom' => array(),
                 'monitor_customer_cart' => false,
+                'enable_visitor_recognition' => true
             );
         if (isset($current_settings['tawkto_visibility'])) {
             $options = $current_settings['tawkto_visibility'];
@@ -126,7 +127,8 @@ public function setoptions() {
                 'show_oncategory' => false,
                 'show_onproduct' => false,
                 'show_oncustom' => array(),
-                'monitor_customer_cart' => false
+                'monitor_customer_cart' => false,
+                'enable_visitor_recognition' => false
             );
 
         if (isset($_REQUEST['options']) && !empty($_REQUEST['options'])) {
@@ -152,7 +154,8 @@ public function setoptions() {
                     case 'show_onproduct':
                     case 'always_display':
                     case 'monitor_customer_cart':
-                        $jsonOpts[$column] = ($value==1)?true:false;
+                    case 'enable_visitor_recognition':
+                        $jsonOpts[$column] = $value == 1;
                         break;
                 }
             }
diff --git a/admin/view/template/extension/module/tawkto.tpl b/admin/view/template/extension/module/tawkto.tpl
index 79a4431..2f4023f 100644
--- a/admin/view/template/extension/module/tawkto.tpl
+++ b/admin/view/template/extension/module/tawkto.tpl
@@ -147,6 +147,21 @@
                                     <?php echo ($display_opts['monitor_customer_cart'])?'checked':'';?>  />
                             </div>
                         </div>
+                        <br><br>
+                        <div class="col-lg-12">
+                            <div class="panel-heading"><strong>Privacy Options</strong></div>
+                        </div>
+                        <div class="form-group col-lg-12">
+                            <label for="enable_visitor_recognition" class="col-lg-6 control-label">
+                            Enable Visitor Recognition
+                            <br>
+                            <span class="attrib_desc">Enable sending of customer details to tawk.to dashboard when the customer is logged in.</span>
+                            </label>
+                            <div class="col-lg-6 control-label ">
+                                <input type="checkbox" class="col-lg-6 " name="enable_visitor_recognition" id="enable_visitor_recognition" value="1"
+                                    <?php echo ($display_opts['enable_visitor_recognition'])?'checked':'';?>  />
+                            </div>
+                        </div>
                         <div class="form-group col-lg-12">
                             <div class="col-lg-6 col-xs-12">
                                 <button type="submit" value="1" id="module_form_submit_btn" name="submitBlockCategories" class="btn btn-default pull-right"><i class="process-icon-save"></i> Save</button>
diff --git a/catalog/controller/extension/module/tawkto.php b/catalog/controller/extension/module/tawkto.php
index 93127c8..00945c1 100644
--- a/catalog/controller/extension/module/tawkto.php
+++ b/catalog/controller/extension/module/tawkto.php
@@ -32,13 +32,20 @@ public function index() {
         $data['customer'] = array();
         $data['orders'] = array();
         $data['can_monitor_customer_cart'] = false;
+        $data['enable_visitor_recognition'] = true; // default
 
         if (!is_null($this->customer->getId())) {
             $data['customer'] = $this->customer;
         }
 
-        if (!is_null($settings) && !is_null($settings->monitor_customer_cart)) {
-            $data['can_monitor_customer_cart'] = $settings->monitor_customer_cart;
+        if (!is_null($settings)) {
+            if (!is_null($settings->monitor_customer_cart)) {
+                $data['can_monitor_customer_cart'] = $settings->monitor_customer_cart;
+            }
+
+            if (!is_null($settings->enable_visitor_recognition)) {
+                $data['enable_visitor_recognition'] = $settings->enable_visitor_recognition;
+            }
         }
 
         return $this->load->view('extension/module/tawkto', $data);
diff --git a/catalog/view/theme/default/template/extension/module/tawkto.tpl b/catalog/view/theme/default/template/extension/module/tawkto.tpl
index 78d362f..16cc513 100644
--- a/catalog/view/theme/default/template/extension/module/tawkto.tpl
+++ b/catalog/view/theme/default/template/extension/module/tawkto.tpl
@@ -8,7 +8,7 @@
 ?><!--Start of tawk.to Script-->
 <script type="text/javascript">
 var Tawk_API=Tawk_API||{}, Tawk_LoadStart=new Date();
-<?php if (!is_array($customer) && $customer->isLogged()) { ?>
+<?php if (!is_array($customer) && $customer->isLogged() && $enable_visitor_recognition) { ?>
     Tawk_API.visitor = {
         name  : "<?php echo $customer->getFirstName(), ' ' ,$customer->getLastName(); ?>",
         email : "<?php echo $customer->getEmail(); ?>",

From 99d00c9e627f4ab4ca1f86eb9d451640dc7e62d9 Mon Sep 17 00:00:00 2001
From: Alvin Johnson So <so.alvinjohnson@gmail.com>
Date: Fri, 26 Feb 2021 18:09:43 +0800
Subject: [PATCH 2/2] translated php syntax to twig format in admin
 tawkto.twig; added enable_visitor_recognition condition in embed tawkto.twig;

---
 README.md                                                    | 3 +++
 admin/view/template/extension/module/tawkto.twig             | 5 +++--
 .../view/theme/default/template/extension/module/tawkto.twig | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 08357d8..d2f67df 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,9 @@ Visit our [Help Center](https://help.tawk.to/) for answers to FAQs
 
 ## Changelog
 
+### 2.1.0
+* Added enable/disable option for visitor recognition feature.
+
 ### 2.0.0
 * Updated module for Opencart 3 compatibility support.
 
diff --git a/admin/view/template/extension/module/tawkto.twig b/admin/view/template/extension/module/tawkto.twig
index fe7c729..ecec737 100644
--- a/admin/view/template/extension/module/tawkto.twig
+++ b/admin/view/template/extension/module/tawkto.twig
@@ -226,8 +226,9 @@
                             <span class="attrib_desc">Enable sending of customer details to tawk.to dashboard when the customer is logged in.</span>
                             </label>
                             <div class="col-lg-6 control-label ">
-                                <input type="checkbox" class="col-lg-6 " name="enable_visitor_recognition" id="enable_visitor_recognition" value="1"
-                                    <?php echo ($display_opts['enable_visitor_recognition'])?'checked':'';?>  />
+                                <input type="checkbox" class="col-lg-6 " name="enable_visitor_recognition"
+                                    id="enable_visitor_recognition" value="1"
+                                    {{(display_opts.enable_visitor_recognition)?'checked':''}} />
                             </div>
                         </div>
                         <div class="form-group col-lg-12" style="margin-bottom: 1rem;">
diff --git a/catalog/view/theme/default/template/extension/module/tawkto.twig b/catalog/view/theme/default/template/extension/module/tawkto.twig
index 7ba56c7..36be761 100644
--- a/catalog/view/theme/default/template/extension/module/tawkto.twig
+++ b/catalog/view/theme/default/template/extension/module/tawkto.twig
@@ -9,7 +9,7 @@
 <script type="text/javascript">
 var Tawk_API=Tawk_API||{},Tawk_LoadStart=new Date();
 
-{% if logged_in %}
+{% if logged_in and enable_visitor_recognition %}
 Tawk_API.visitor = {{visitor}};
 {% endif %}