From 15e38e6af5321ae6ff31e14b23f4891121dc00d2 Mon Sep 17 00:00:00 2001
From: Andi Nitsche <andi@inbaz.org>
Date: Fri, 28 Oct 2016 07:35:21 +0200
Subject: [PATCH] stabilise transferred items in admin panel

---
 .../src/Admin/Controller/OrderController.php  |  2 +-
 .../view/partial/order-detail-item.phtml      | 20 ++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/module/Admin/src/Admin/Controller/OrderController.php b/module/Admin/src/Admin/Controller/OrderController.php
index 7f11b28d..03168229 100644
--- a/module/Admin/src/Admin/Controller/OrderController.php
+++ b/module/Admin/src/Admin/Controller/OrderController.php
@@ -368,7 +368,7 @@ public function sendEticketsAction() {
                     $bcc->setEmail($config['ERS']['info_mail']);
                     $emailService->addBcc($bcc);
 
-                    $subject = "Your registration for ".$config['ERS']['short_name']." (order ".$order->getCode()->getValue().")";
+                    #$subject = "Your registration for ".$config['ERS']['name_short']." (order ".$order->getCode()->getValue().")";
                     $subject = "[".$config['ERS']['name_short']."] E-Ticket for ".$participant->getFirstname()." ".$participant->getSurname()." (order ".$order->getCode()->getValue().")";
                     $emailService->setSubject($subject);
 
diff --git a/module/Admin/view/partial/order-detail-item.phtml b/module/Admin/view/partial/order-detail-item.phtml
index 7221423b..09fabc7e 100644
--- a/module/Admin/view/partial/order-detail-item.phtml
+++ b/module/Admin/view/partial/order-detail-item.phtml
@@ -84,13 +84,19 @@
                     <i data-toggle="tooltip" data-placement="bottom" class="fa fa-child color-primary" title="0 € child ticket"></i>
                     <?php break;
                 case 'transferred': 
-                    $transferredPackage = $item->getTransferredItem()->getPackage();
-                    $transferredParticipant = $transferredPackage->getParticipant();
-                    $transferredOrder = $transferredPackage->getOrder();
-                    ?>
-                    <a href="<?php echo $this->url('admin/order', array('action' => 'detail', 'id' => $transferredOrder->getId())); ?>">
-                        <i data-toggle="tooltip" data-placement="bottom" class="fa fa-forward color-primary" title="transferred to <?php echo $transferredParticipant->getFirstname().' '.$transferredParticipant->getSurname(); ?>"></i>
-                    </a>
+                    $transferredItem = $item->getTransferredItem();
+                    if($transferredItem):
+                        $transferredPackage = $transferredItem->getPackage();
+                        $transferredParticipant = $transferredPackage->getParticipant();
+                        $transferredOrder = $transferredPackage->getOrder();
+                        ?>
+                        <a href="<?php echo $this->url('admin/order', array('action' => 'detail', 'id' => $transferredOrder->getId())); ?>">
+                            <i data-toggle="tooltip" data-placement="bottom" class="fa fa-forward color-primary" title="transferred to <?php echo $transferredParticipant->getFirstname().' '.$transferredParticipant->getSurname(); ?>"></i>
+                        </a>
+                    <?php else: ?>
+                    <i class="fa fa-question text-info"></i>
+                    <?php endif; ?>
+                    
                     <?php break;
                 default: ?>
                     <i data-toggle="tooltip" data-placement="bottom" class="fa fa-question color-primary" title="unknown"></i>