From 058c254f0d39a6ab1cad94de42863117404cdfb5 Mon Sep 17 00:00:00 2001
From: Petar Sambolek <sambolek.petar@gmail.com>
Date: Thu, 4 Oct 2018 10:24:20 +0200
Subject: [PATCH] Backport 2.2 - Fix issue 17152 - prevent email being marked
 as not sent if email copy fails due to exception

---
 .../Sales/Model/Order/Email/Sender.php        | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender.php b/app/code/Magento/Sales/Model/Order/Email/Sender.php
index 6d4480c4c45e0..564fd1e2a4b98 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender.php
@@ -65,6 +65,8 @@ public function __construct(
     }
 
     /**
+     * Send order email if it is enabled in configuration.
+     *
      * @param Order $order
      * @return bool
      */
@@ -81,17 +83,21 @@ protected function checkAndSend(Order $order)
 
         try {
             $sender->send();
-            $sender->sendCopyTo();
         } catch (\Exception $e) {
             $this->logger->error($e->getMessage());
-
             return false;
         }
-
+        try {
+            $sender->sendCopyTo();
+        } catch (\Exception $e) {
+            $this->logger->error($e->getMessage());
+        }
         return true;
     }
 
     /**
+     * Populate order email template with customer information.
+     *
      * @param Order $order
      * @return void
      */
@@ -113,6 +119,8 @@ protected function prepareTemplate(Order $order)
     }
 
     /**
+     * Create Sender object using appropriate template and identity.
+     *
      * @return Sender
      */
     protected function getSender()
@@ -126,6 +134,8 @@ protected function getSender()
     }
 
     /**
+     * Get template options.
+     *
      * @return array
      */
     protected function getTemplateOptions()
@@ -137,6 +147,8 @@ protected function getTemplateOptions()
     }
 
     /**
+     * Render shipping address into html.
+     *
      * @param Order $order
      * @return string|null
      */
@@ -148,6 +160,8 @@ protected function getFormattedShippingAddress($order)
     }
 
     /**
+     * Render billing address into html.
+     *
      * @param Order $order
      * @return string|null
      */