From 616f922306db2396b42b452e5dca8d2047d91386 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 14 Jul 2016 19:50:00 -0700 Subject: [PATCH] Fixes #2254 --- resources/views/emails/accept-asset.blade.php | 122 +++++++++--------- 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/resources/views/emails/accept-asset.blade.php b/resources/views/emails/accept-asset.blade.php index 62c7bac45..859f12a4d 100755 --- a/resources/views/emails/accept-asset.blade.php +++ b/resources/views/emails/accept-asset.blade.php @@ -1,91 +1,91 @@ @extends('emails/layouts/default') @section('content') -

Hello {{ $first_name }},

+

Hello {{ $first_name }},

-

A new item has been checked out under your name, details are below.

+

A new item has been checked out under your name, details are below.

- - - - - - @if isset($item_tag) +
- Asset Name: - - {{ $item_name }} -
- @endif - @if isset($item_serial) + @if (isset($item_tag)) + + + + + @endif + @if (isset($item_serial)) + + + + + @endif - @endif - - - - - @if isset($expected_checkin) - - - - - @endif - @if isset($note) - - - - - @endif -
- Asset Tag: + Asset Name: - {{ $item_tag }} + {{ $item_name }}
+ Asset Tag: + + {{ $item_tag }} +
+ Serial: + + {{ $item_serial }} +
- Serial: + Checkout Date: - {{ $item_serial }} + {{ $checkout_date }}
- Checkout Date: - - {{ $checkout_date }} -
- Expected Checkin Date: - - {{ $expected_checkin }} -
- Additional Notes: - - {{ $note }} -
+ @if (isset($expected_checkin)) + + + Expected Checkin Date: + + + {{ $expected_checkin }} + + + @endif + @if (isset($note)) + + + Additional Notes: + + + {{ $note }} + + + @endif + -@if (($require_acceptance==1) && ($eula!='')) + @if (($require_acceptance==1) && ($eula!='')) - Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset. + Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset. -@elseif (($require_acceptance==1) && ($eula=='')) + @elseif (($require_acceptance==1) && ($eula=='')) - Please click on the link at the bottom to confirm that you have received the asset. + Please click on the link at the bottom to confirm that you have received the asset. -@elseif (($require_acceptance==0) && ($eula!='')) + @elseif (($require_acceptance==0) && ($eula!='')) - Please read the terms of use below. + Please read the terms of use below. -@endif + @endif -

+

-

{!! $eula !!}

+

{!! $eula !!}

-@if ($require_acceptance==1) -

I have read and agree to the terms of use, and have received this item.

-@endif + @if ($require_acceptance==1) +

I have read and agree to the terms of use, and have received this item.

+ @endif -

{{ \App\Models\Setting::getSettings()->site_name }}

+

{{ \App\Models\Setting::getSettings()->site_name }}

@stop