Merge pull request #905 from inbaz/develop

Develop
BigAndini · Oct 28, 2016 · 986c80e · 986c80e
2 parents 9191476 + 15e38e6
commit 986c80e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git 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
@@ -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>

diff --git a/module/PreReg/view/partial/eticket-package-overview.phtml b/module/PreReg/view/partial/eticket-package-overview.phtml
@@ -84,20 +84,15 @@
                         <table class="day-table">
                             <tr>
                                 <?php foreach($product->getProductVariantByName($productVariantName)->getProductVariantValues() as $value):
-                                    #$timestamp = strtotime($value->getValue());
                                     $timestamp = strtotime($translate[$value->getValue()]);
                                     $date = new DateTime();
                                     $date->setTimestamp($timestamp); 
                                     ?>
-                                    <td><?php 
-                                    #echo $date->format('D'); 
-                                    echo strftime('%a', $date->getTimestamp());
-                                    ?></td>
+                                    <td><?php echo strftime('%a', $date->getTimestamp()); ?></td>
                                 <?php endforeach; ?>
                             </tr>
                             <tr>
                                 <?php foreach($product->getProductVariantByName($productVariantName)->getProductVariantValues() as $value):
-                                    #$timestamp = strtotime($value->getValue());
                                     $timestamp = strtotime($translate[$value->getValue()]);
                                     $date = new DateTime();
                                     $date->setTimestamp($timestamp); ?>
@@ -106,7 +101,6 @@
                             </tr>
                             <tr>
                                 <?php foreach($product->getProductVariantByName($productVariantName)->getProductVariantValues() as $value):
-                                    #$timestamp = strtotime($value->getValue());
                                     $timestamp = strtotime($translate[$value->getValue()]);
                                     $date = new DateTime();
                                     $date->setTimestamp($timestamp);