From f8ea51dd97c3cdfb3cfd169c6350f7b88c2d8202 Mon Sep 17 00:00:00 2001
From: Sam Bell <me@sam-bell.com>
Date: Tue, 6 Mar 2018 20:40:49 +0000
Subject: [PATCH] Add VAT and updated totals to order confirmations

---
 .../views/Emails/OrderConfirmation.blade.php  | 32 +++++++++++++++++--
 .../Partials/EventViewOrderSection.blade.php  | 29 +++++++++++++++++
 2 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/resources/views/Emails/OrderConfirmation.blade.php b/resources/views/Emails/OrderConfirmation.blade.php
index b0d97adf..902f3955 100644
--- a/resources/views/Emails/OrderConfirmation.blade.php
+++ b/resources/views/Emails/OrderConfirmation.blade.php
@@ -76,16 +76,44 @@ Order Email: <b>{{$order->email}}</b><br>
             <td>
             </td>
             <td>
-                <b>Sub Total</b>
+                Sub Total
             </td>
             <td colspan="2">
                {{money($order->amount + $order->order_fee, $order->event->currency)}}
             </td>
         </tr>
+        <tr>
+            <td>
+            </td>
+            <td>
+            </td>
+            <td>
+            </td>
+            <td>
+                {{$event->organiser->taxname}}
+            </td>
+            <td colspan="2">
+               {{money(($order->amount*($event->organiser->taxvalue)/100), $event->currency)}}
+            </td>
+        </tr>
+        <tr>
+            <td>
+            </td>
+            <td>
+            </td>
+            <td>
+            </td>
+            <td>
+                <b>Total</b>
+            </td>
+            <td colspan="2">
+               {{money($order->amount+($order->amount*($event->organiser->taxvalue)/100), $event->currency)}}
+            </td>
+        </tr>
     </table>
 
     <br><br>
 </div>
 <br><br>
 Thank you
-@stop
+@stop
\ No newline at end of file
diff --git a/resources/views/Public/ViewEvent/Partials/EventViewOrderSection.blade.php b/resources/views/Public/ViewEvent/Partials/EventViewOrderSection.blade.php
index 379a1e8d..98df5e6f 100644
--- a/resources/views/Public/ViewEvent/Partials/EventViewOrderSection.blade.php
+++ b/resources/views/Public/ViewEvent/Partials/EventViewOrderSection.blade.php
@@ -82,6 +82,7 @@
 
                         <div class="col-sm-4 col-xs-6">
                             <b>Amount</b><br> {{$order->event->currency_symbol}}{{number_format($order->total_amount,2)}}
+                            <small>{{ ($event->organiser->taxname && $event->organiser->taxvalue) ? '(+'.money(($order->total_amount*($event->organiser->taxvalue)/100), $event->currency).' '.$event->organiser->taxname.')' : '' }}</small>
                         </div>
 
                         <div class="col-sm-4 col-xs-6">
@@ -186,6 +187,34 @@
                                     {{money($order->total_amount, $order->event->currency)}}
                                 </td>
                             </tr>
+                            <tr>
+                                <td>
+                                </td>
+                                <td>
+                                </td>
+                                <td>
+                                </td>
+                                <td>
+                                    {{$event->organiser->taxname}}
+                                </td>
+                                <td colspan="2">
+                                   {{money(($order->total_amount*($event->organiser->taxvalue)/100), $event->currency)}}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                </td>
+                                <td>
+                                </td>
+                                <td>
+                                </td>
+                                <td>
+                                    <b>Total</b>
+                                </td>
+                                <td colspan="2">
+                                   {{money($order->total_amount+($order->total_amount*($event->organiser->taxvalue)/100), $event->currency)}}
+                                </td>
+                            </tr>
                             @if($order->is_refunded || $order->is_partially_refunded)
                                 <tr>
                                     <td>