Adds better support to capture e-mails when queue is enabled, loads e-mail in an iframe

Author: madalinoprea

code/Debug/Model/Core/Email/Template.php

@@ -93,10 +93,16 @@ public function addEmailToProfile($email, $name, $variables, $result, Zend_Mail
      */
     public function getContent(Zend_Mail $mail)
     {
+        $hasQueue = $this->hasQueue();
+
+        if ($hasQueue && $queue = $this->getQueue()) {
+            return $queue->getMessageBody();
+        }
+
         /** @var Zend_Mime_Part $content */
         $content = $this->isPlain() ? $mail->getBodyText() : $mail->getBodyHtml();
 
-        return $content->getRawContent();
+        return $content ? $content->getRawContent() : '';
     }
 
 
@@ -108,6 +114,10 @@ public function getContent(Zend_Mail $mail)
      */
     public function decodeSubject($subject)
     {
+        if ($this->hasQueue() && $queue = $this->getQueue()) {
+            return $queue->getMessageParameters('subject');
+        }
+
         return base64_decode(substr($subject, strlen('=?utf-8?B?'), -1 * strlen('?=')));
     }
 

design/template/sheep_debug/view/panel/email.phtml

@@ -42,16 +42,6 @@ $emailConfigs = Mage::getModel('sheep_debug/service')->searchConfig('email');
 
                             <td>
                                 <?php echo $this->escapeHtml($email->getSubject()); ?>
-
-                                <div class="text-small font-normal">
-                                    <a class="link-inverse"
-                                       href="<?php echo Mage::helper('sheep_debug/url')->getEmailBodyUrl($info->getToken(), $row) ?>"
-                                       onclick="return fetchData(this);"
-                                       title="<?php echo $this->__('Retrieve E-mail Body'); ?>"
-                                       data-target-id="email-body-<?php echo $row ?>">
-                                        <?php echo $this->__('Retrieve E-mail Body'); ?>
-                                    </a>
-                                </div>
                             </td>
 
                             <td>
@@ -83,8 +73,7 @@ $emailConfigs = Mage::getModel('sheep_debug/service')->searchConfig('email');
                         <tr bgcolor="#6495ed">
                             <td></td>
                             <td bgcolor="#00008b" colspan="4">
-                                <div id="email-body-<?php echo $row ?>"></div>
-                                &nbsp;
+                                <iframe width="100%" height="400" src="<?php echo Mage::helper('sheep_debug/url')->getEmailBodyUrl($info->getToken(), $row) ?>" frameborder="0"></iframe>
                             </td>
                         </tr>
                         <?php $row++; ?>