springup/cmc-sales
2
0
Fork 0
Code Issues 48 Pull requests Actions Packages Projects Releases Wiki Activity

Fix conflict

Browse source
This commit is contained in:
Karl Cordes 2019-03-18 18:56:19 +11:00
parent 6c8ce9a78b 8b59b66ee6
commit 8cd4804652
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/app_controller.php
View file

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

2
app/views/elements/pdf_shipping_billing_box.ctp
View file

@ -15,6 +15,8 @@ $col3width = '30%';
<? if($docType == 'orderAck'): ?> <? if($docType == 'orderAck'): ?>
<span style="text-decoration: none;">Estimated Despatch Date:</span> <span style="text-align: right;"><?=$estimated_delivery?></span><br> <span style="text-decoration: none;">Estimated Despatch Date:</span> <span style="text-align: right;"><?=$estimated_delivery?></span><br>
<? endif; ?> <? 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: none;">Page: <?=$pageNo?> of <?=$totalCount?></span><br><br>
<span style="text-decoration: underline;">MAKE PAYMENT TO:</span><br> <span style="text-decoration: underline;">MAKE PAYMENT TO:</span><br>
<span style="text-decoration: none;">Account Name: CMC Technologies Pty Ltd<br> <span style="text-decoration: none;">Account Name: CMC Technologies Pty Ltd<br>