Merge pull request #6608 from gregory-p/wordpress

LAW-5340

environments/demo/wp-config-local.php

@@ -15,4 +15,6 @@ define('LAWCARTA_WP_REST_API_RESPONSE_URL', 'https://app-demo.lawcarta.com/v1/ev
 
 define('LAWCARTA_ENVIRONMENT_NAME', 'demo');
 
+define('LC_ALLOW_COOKIE_POPUP', true);
+
 $_SERVER['HTTPS'] = 'On';

environments/dev/wp-config-local.php

@@ -15,4 +15,6 @@ define('LAWCARTA_WP_REST_API_RESPONSE_URL', 'https://app-dev.lawcarta.com/v1/eve
 
 define('LAWCARTA_ENVIRONMENT_NAME', 'dev');
 
+define('LC_ALLOW_COOKIE_POPUP', true);
+
 $_SERVER['HTTPS'] = 'On';

environments/local/wp-config-local.php

@@ -11,6 +11,7 @@ define('LAWCARTA_SUBDOMAIN', 'app');
 define('LAWCARTA_PORT', '');
 
 define('LAWCARTA_ENVIRONMENT_NAME', 'local');
+define('LC_ALLOW_COOKIE_POPUP', true);
 
 $_SERVER['HTTPS'] = 'On';
 

environments/prod/wp-config-local.php

@@ -12,6 +12,8 @@ define('LAWCARTA_PORT', '');
 
 define('LAWCARTA_ENVIRONMENT_NAME', 'prod');
 
+define('LC_ALLOW_COOKIE_POPUP', true);
+
 define('LAWCARTA_GA_CONFIG', 'UA-111488943-1');
 define('LIVECARTA_GA_CONFIG', 'UA-111488943-2');
 

environments/qa/wp-config-local.php

@@ -12,6 +12,8 @@ define('LAWCARTA_PORT', '');
 
 define('LAWCARTA_ENVIRONMENT_NAME', 'qa');
 
+define('LC_ALLOW_COOKIE_POPUP', true);
+
 $_SERVER['HTTPS'] = 'On';
 
 //S3 uploads settings

htdocs/wp-content/themes/lawcarta/functions.php

@@ -357,8 +357,7 @@ function mark_redirected_user(){
     if(
         isset($_GET['law'])
         && $_GET['law'] == 1
-        && isset($_COOKIE['cookie_level'])
+        && ((isset($_COOKIE['cookie_level']) && in_array($_COOKIE['cookie_level'], ['12', '123'])) || LC_ALLOW_COOKIE_POPUP == false)
-        && in_array($_COOKIE['cookie_level'], ['12', '123'])
     ){
         $cookieDomain = (LAWCARTA_ENVIRONMENT_NAME == 'local') ? 'livecarta.loc' : 'livecarta.com';
         setcookie('law_'.LAWCARTA_ENVIRONMENT_NAME, 1,0,"/", $cookieDomain);

htdocs/wp-content/themes/lawcarta/header.php

@@ -58,7 +58,10 @@ $scripts = [];
         })(window,document,'script','dataLayer','GTM-K8LWZ6K');"]; ?>
         <?php $scripts[] = ['type' => 'comment', 'source' =>'End Google Tag Manager']; ?>
     <?php endif;?>
-    <?php if(isset($_COOKIE['cookie_level']) && in_array($_COOKIE['cookie_level'],['13','123'])):?>
+    <?php if(
+            (isset($_COOKIE['cookie_level']) && in_array($_COOKIE['cookie_level'],['13','123']))
+            || LC_ALLOW_COOKIE_POPUP == false
+            ):?>
         <?php foreach($scripts as $script):?>
             <?php switch($script['type']):
                 case 'comment': ?>
@@ -77,7 +80,7 @@ $scripts = [];
                 <?php endswitch; ?>
         <?php endforeach;?>
     <?php endif; ?>
-    <?php if(!isset($_COOKIE['cookie_level'])):?>
+    <?php if(!isset($_COOKIE['cookie_level']) && LC_ALLOW_COOKIE_POPUP == true):?>
     <script>
         var scripts = <?php echo json_encode($scripts) ?>;
     </script>