Fixed order email, added site url tests, add doctrine/dbal, add service::site()

resources/theme/frontend/metronic/layouts/partials/mainheader.blade.php

@@ -15,7 +15,9 @@
 			<div class="col-md-6 col-sm-6 additional-nav">
 				<ul class="list-unstyled list-inline pull-right">
 					<li><a href="{{ url('home') }}">Log In</a></li>
-					<li><a href="{{ url('register') }}">Registration</a></li>
+					@isset($register)
+						<li><a href="{{ url('register') }}">Registration</a></li>
+					@endisset
 				</ul>
 			</div>
 			<!-- END TOP BAR MENU -->

resources/views/email/admin/order/approve.blade.php

@@ -1,30 +1,26 @@
-@component('mail::message',['site'=>$site,'heading'=>'Please Order the following...'])
-# Please order the following service.
-
-@component('mail::panel')
+@component('mail::message',['site'=>$site,'heading'=>'New Order'])
+Please order the following...
 
 @component('mail::table')
-	| Service     | Details           |
-	| :---------- | :---------------- |
-	| Account     | {{ $service->account_name }} ({!! $service->account->account_id_url !!}) |
-	| Service ID  | {!! $service->service_id_url !!} |
-	| Product     | {{ $service->product_name }} |
-	@switch($service->product_category)
-		@case('ADSL')
-		| Address     | {{ $service->type->service_address }} |
-		@break;
-		@case('VOIP')
-		| Number     | {{ $service->type->service_number }} |
-		| Supplier Details | {{ join(':',$service->order_info) }} |
-		@break;
-	@endswitch
-
+| Service     | Details           |
+| :---------- | :---------------- |
+| Account     | {{ $service->account_name }} ({!! $service->account->account_id_url !!}) |
+| Service ID  | {!! $service->service_id_url !!} |
+| Product     | {{ $service->product_name }} |
+@switch($service->product_category)
+@case('ADSL')
+| Address     | {{ $service->type->service_address }} |
+@break;
+@case('VOIP')
+| Number     | {{ $service->type->service_number }} |
+| Supplier Details | {{ join(':',$service->order_info) }} |
+@break;
+@endswitch
 @endcomponent
 
+
 **NOTES:** {{ $notes }}
 
-@endcomponent
-
 Thanks,<br>
 {{ config('app.name') }}
 @endcomponent

resources/views/vendor/mail/html/table.blade.php

@@ -0,0 +1,3 @@
+<div class="light-box">
+{{ Illuminate\Mail\Markdown::parse($slot) }}
+</div>