Fix conflict

app/controllers/app_controller.php

@@ -20,6 +20,7 @@ class AppController extends Controller {
 
     }
 
+
     /**
      * Check if the current logged in user is an admin
      * @return boolean

app/views/elements/pdf_shipping_billing_box.ctp

@@ -15,6 +15,8 @@ $col3width = '30%';
 	    <? if($docType == 'orderAck'): ?>
 	    <span style="text-decoration: none;">Estimated Despatch Date:</span> <span style="text-align: right;"><?=$estimated_delivery?></span><br>
 	    <? endif; ?>
+
+	    <?php //TODO put conditional logic here if currency is AUD or EUR ?>
 	    <span style="text-decoration: none;">Page: <?=$pageNo?> of <?=$totalCount?></span><br><br>
 	    <span style="text-decoration: underline;">MAKE PAYMENT TO:</span><br>
 	    <span style="text-decoration: none;">Account Name: CMC Technologies Pty Ltd<br>