Merge branch 'developer' into production

app/design/frontend/Joshine/breeze/Magento_Checkout/templates/success.phtml

@@ -86,6 +86,13 @@ $helper = $objectManager->get('Joshine\GoogleFeed\Helper\GAHelper');
     //});
     <?php if ($block->getOrderId() && $tracking_show > 0 && !empty($tracking_conversion)) :?>
         setTimeout(function () {
+
+            <?php if (isset($email) && !empty($email)) :?>
+            gtag('set' , 'user_data' , {
+                "sha256_email_address" :  '<?= $helper::normalizeAndHashEmailAddress("sha256", $email); ?>'
+            });
+            <?php endif; ?>
+
             gtag('event', 'conversion', {
                 'send_to': '<?= /* @noEscape */ $tracking_conversion ?>',
                 'value': '<?= /* @noEscape */ $totalPrice ?>',
@@ -96,15 +103,11 @@ $helper = $objectManager->get('Joshine\GoogleFeed\Helper\GAHelper');
             gtag('event', 'purchase', {
                 "transaction_id": '<?= /* @noEscape */ $block->getOrderId() ?>',
                 "value": '<?= /* @noEscape */ $totalPrice ?>',
-                "currency": '<?= /* @noEscape */ $currency ?>',,
+                "currency": '<?= /* @noEscape */ $currency ?>',
                 "items": <?= json_encode($googleItems, true); ?>
             });
 
-            <?php if (isset($email) && !empty($email)) :?>
-            gtag('set' , 'user_data' , {
-                "sha256_email_address" :  '<?= $helper::normalizeAndHashEmailAddress("sha256", $email); ?>'
-            });
-            <?php endif; ?>
+
         }, 1500);
     <?php endif;?>
 </script>