From dcd47ea5430610d0d2c8d92e7b5e31da34f88dd8 Mon Sep 17 00:00:00 2001
From: Jeremy Quinton <jeremyquinton@gmail.com>
Date: Wed, 18 Jul 2018 17:50:06 +0200
Subject: [PATCH] Updating template

1) Found a stray template that did not get the latest tax updates so added the standard tax logic to the template
---
 .../views/en/Emails/OrderConfirmation.blade.php      | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/resources/views/en/Emails/OrderConfirmation.blade.php b/resources/views/en/Emails/OrderConfirmation.blade.php
index 0634f399..fe60badf 100644
--- a/resources/views/en/Emails/OrderConfirmation.blade.php
+++ b/resources/views/en/Emails/OrderConfirmation.blade.php
@@ -76,12 +76,13 @@ Order Email: <b>{{$order->email}}</b><br>
             <td>
             </td>
             <td>
-                Sub Total
+                <b>Sub Total</b>
             </td>
             <td colspan="2">
-               {{money($order->amount + $order->order_fee, $order->event->currency)}}
+                {{$orderService->getOrderTotalWithBookingFee(true)}}
             </td>
         </tr>
+        @if($order->event->organiser->charge_tax == 1)
         <tr>
             <td>
             </td>
@@ -90,12 +91,13 @@ Order Email: <b>{{$order->email}}</b><br>
             <td>
             </td>
             <td>
-                {{$event->organiser->taxname}}
+                <b>{{$order->event->organiser->tax_name}}</b>
             </td>
             <td colspan="2">
-               {{money(($order->amount*($event->organiser->taxvalue)/100), $event->currency)}}
+                {{$orderService->getTaxAmount(true)}}
             </td>
         </tr>
+        @endif
         <tr>
             <td>
             </td>
@@ -107,7 +109,7 @@ Order Email: <b>{{$order->email}}</b><br>
                 <b>Total</b>
             </td>
             <td colspan="2">
-               {{money($order->amount+($order->amount*($event->organiser->taxvalue)/100), $event->currency)}}
+                {{$orderService->getGrandTotal(true)}}
             </td>
         </tr>
     </table>