From dda7fa71ed7ad870fb7d836afd3fe82aeccda9c1 Mon Sep 17 00:00:00 2001
From: Etienne Marais <emarais@quint.co.uk>
Date: Sat, 8 Jun 2019 18:37:24 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20FIX:=20Add=20business=20details?=
 =?UTF-8?q?=20to=20order=20tickets=20email.=20Clean=20up=20html=20a=20litt?=
 =?UTF-8?q?le?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TicketMailer/SendOrderTickets.blade.php   | 111 ++++++++----------
 1 file changed, 46 insertions(+), 65 deletions(-)

diff --git a/resources/views/en/Mailers/TicketMailer/SendOrderTickets.blade.php b/resources/views/en/Mailers/TicketMailer/SendOrderTickets.blade.php
index dc5b3279..ec43a774 100644
--- a/resources/views/en/Mailers/TicketMailer/SendOrderTickets.blade.php
+++ b/resources/views/en/Mailers/TicketMailer/SendOrderTickets.blade.php
@@ -3,99 +3,88 @@
 @section('message_content')
 Hello,<br><br>
 
-Your order for the event <b>{{$order->event->title}}</b> was successful.<br><br>
+Your order for the event <strong>{{$order->event->title}}</strong> was successful.<br><br>
 
-Your tickets are attached to this email. You can also view you order details and download your tickets at: {{route('showOrderDetails', ['order_reference' => $order->order_reference])}}
+Your tickets are attached to this email. You can also view you order details and download your tickets
+at: {{route('showOrderDetails', ['order_reference' => $order->order_reference])}}
 
 @if(!$order->is_payment_received)
 <br><br>
-<b>Please note: This order still requires payment. Instructions on how to make payment can be found on your order page: {{route('showOrderDetails', ['order_reference' => $order->order_reference])}}</b>
+<strong>Please note: This order still requires payment. Instructions on how to make payment can be found on your
+    order page: {{route('showOrderDetails', ['order_reference' => $order->order_reference])}}</strong>
 <br><br>
 @endif
 <h3>Order Details</h3>
-Order Reference: <b>{{$order->order_reference}}</b><br>
-Order Name: <b>{{$order->full_name}}</b><br>
-Order Date: <b>{{$order->created_at->format(config('attendize.default_datetime_format'))}}</b><br>
-Order Email: <b>{{$order->email}}</b><br>
+Order Reference: <strong>{{$order->order_reference}}</strong><br>
+Order Name: <strong>{{$order->full_name}}</strong><br>
+Order Date: <strong>{{$order->created_at->format(config('attendize.default_datetime_format'))}}</strong><br>
+Order Email: <strong>{{$order->email}}</strong><br>
+@if ($order->is_business)
+Business: <strong>{{$order->business_name}}</strong><br>
+Tax number: <strong>{{$order->business_tax_number}}</strong><br>
+Business Address: <strong>{{$order->business_address}}</strong><br>
+@endif
+
 <a href="{!! route('downloadCalendarIcs', ['event_id' => $order->event->id]) !!}">Add To Calendar</a>
 <h3>Order Items</h3>
 <div style="padding:10px; background: #F9F9F9; border: 1px solid #f1f1f1;">
     <table style="width:100%; margin:10px;">
         <tr>
             <td>
-                <b>Ticket</b>
+                <strong>Ticket</strong>
             </td>
             <td>
-                <b>Qty.</b>
+                <strong>Qty.</strong>
             </td>
             <td>
-                <b>Price</b>
+                <strong>Price</strong>
             </td>
             <td>
-                <b>Fee</b>
+                <strong>Fee</strong>
             </td>
             <td>
-                <b>Total</b>
+                <strong>Total</strong>
             </td>
         </tr>
         @foreach($order->orderItems as $order_item)
-                                <tr>
-                                    <td>
-                                        {{$order_item->title}}
-                                    </td>
-                                    <td>
-                                        {{$order_item->quantity}}
-                                    </td>
-                                    <td>
-                                        @if((int)ceil($order_item->unit_price) == 0)
-                                        FREE
-                                        @else
-                                       {{money($order_item->unit_price, $order->event->currency)}}
-                                        @endif
-
-                                    </td>
-                                    <td>
-                                        @if((int)ceil($order_item->unit_price) == 0)
-                                        -
-                                        @else
-                                        {{money($order_item->unit_booking_fee, $order->event->currency)}}
-                                        @endif
-
-                                    </td>
-                                    <td>
-                                        @if((int)ceil($order_item->unit_price) == 0)
-                                        FREE
-                                        @else
-                                        {{money(($order_item->unit_price + $order_item->unit_booking_fee) * ($order_item->quantity), $order->event->currency)}}
-                                        @endif
-
-                                    </td>
-                                </tr>
-                                @endforeach
         <tr>
+            <td>{{$order_item->title}}</td>
+            <td>{{$order_item->quantity}}</td>
             <td>
+                @if((int)ceil($order_item->unit_price) == 0)
+                    FREE
+                @else
+                    {{money($order_item->unit_price, $order->event->currency)}}
+                @endif
             </td>
             <td>
+                @if((int)ceil($order_item->unit_price) == 0)
+                    -
+                @else
+                    {{money($order_item->unit_booking_fee, $order->event->currency)}}
+                @endif
             </td>
             <td>
+                @if((int)ceil($order_item->unit_price) == 0)
+                    FREE
+                @else
+                    {{money(($order_item->unit_price + $order_item->unit_booking_fee) * ($order_item->quantity), $order->event->currency)}}
+                @endif
             </td>
-            <td>
-                <b>Sub Total</b>
-            </td>
+        </tr>
+        @endforeach
+        <tr>
+            <td colspan="3"></td>
+            <td><strong>Sub Total</strong></td>
             <td colspan="2">
                 {{$orderService->getOrderTotalWithBookingFee(true)}}
             </td>
         </tr>
         @if($order->event->organiser->charge_tax == 1)
         <tr>
+            <td colspan="3"></td>
             <td>
-            </td>
-            <td>
-            </td>
-            <td>
-            </td>
-            <td>
-                <b>{{$order->event->organiser->tax_name}}</b>
+                <strong>{{$order->event->organiser->tax_name}}</strong><em>({{$order->event->organiser->tax_value}}%)</em>
             </td>
             <td colspan="2">
                 {{$orderService->getTaxAmount(true)}}
@@ -103,21 +92,13 @@ Order Email: <b>{{$order->email}}</b><br>
         </tr>
         @endif
         <tr>
-            <td>
-            </td>
-            <td>
-            </td>
-            <td>
-            </td>
-            <td>
-                <b>Total</b>
-            </td>
+            <td colspan="3"></td>
+            <td><strong>Total</strong></td>
             <td colspan="2">
                 {{$orderService->getGrandTotal(true)}}
             </td>
         </tr>
     </table>
-
     <br><br>
 </div>
 <br><br>