tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes for conflicts

Browse source
This commit is contained in:
David Bomba 2023-02-17 08:34:19 +11:00
parent 4b2afcdec3
commit 23f9679e24
4 changed files with 3 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Mail/Import/CsvImportCompleted.php
View file

@ -14,9 +14,7 @@ namespace App\Mail\Import;
use App\Models\Company; use App\Models\Company;
use App\Utils\Ninja; use App\Utils\Ninja;
use Illuminate\Bus\Queueable;
use Illuminate\Mail\Mailable; use Illuminate\Mail\Mailable;
use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\App;
class CsvImportCompleted extends Mailable class CsvImportCompleted extends Mailable

2
resources/views/email/import/csv_completed.blade.php
View file

@ -2,8 +2,6 @@
<div class="center"> <div class="center">
<h1>{{ ctrans('texts.import_complete') }}</h1> <h1>{{ ctrans('texts.import_complete') }}</h1>
<p><img src="{{ $logo }}"></p>
@if($client_count) @if($client_count)
<p><b>{{ ctrans('texts.clients') }}:</b> {{ $client_count }} </p> <p><b>{{ ctrans('texts.clients') }}:</b> {{ $client_count }} </p>
@endif @endif

12
resources/views/email/template/admin.blade.php
View file

@ -150,16 +150,8 @@
<td align="center"> <td align="center">
<div class="dark-bg" <div class="dark-bg"
style="background-color:#f9f9f9; border: 1px solid #c2c2c2; border-bottom: none; padding-bottom: 20px; border-top-left-radius: 3px; border-top-right-radius: 3px;"> style="background-color:#f9f9f9; border: 1px solid #c2c2c2; border-bottom: none; padding-bottom: 20px; border-top-left-radius: 3px; border-top-right-radius: 3px;">
<!--[if gte mso 9]> <img class="" src="{{ $logo ?? '' }}" width="50%" height="" alt="alt_text" border="0" style="width: 50%; max-width: 570px; height: auto; display: block;" class="g-img">
<img src="{{ $logo ?? '' }}" alt="" width="155" border="0" align="middle" style="display:block;" />
<div style="mso-hide:all;">
<![endif]-->
<img class="logo-light" src="{{ $logo ?? '' }}" alt="" width="400" style="margin-top: 10px; max-width: 200px; display: block; margin-left: auto; margin-right: auto;"/>
<!--[if gte mso 9]>
</div>
<![endif]-->
</div> </div>
</td> </td>

9
resources/views/email/template/client.blade.php
View file

@ -144,14 +144,7 @@
<td align="center" cellpadding="20"> <td align="center" cellpadding="20">
<div style="border: 1px solid #c2c2c2; border-bottom: none; padding-bottom: 10px; border-top-left-radius: 3px; border-top-right-radius: 3px;"> <div style="border: 1px solid #c2c2c2; border-bottom: none; padding-bottom: 10px; border-top-left-radius: 3px; border-top-right-radius: 3px;">
<!--[if gte mso 9]> <img class="" src="{{ $logo ?? '' }}" width="570" height="" alt="alt_text" border="0" style="width: 50%; max-width: 570px; height: auto; display: block;" class="g-img">
<img src="{{ $logo ?? '' }}" alt="" width="400" border="0" align="middle" style="display:block;" />
<div style="mso-hide:all;">
<![endif]-->
<img src="{{ $logo ?? '' }}" alt="" width="400" style="margin-top: 40px; max-width: 200px; display: block; margin-left: auto; margin-right: auto;"/>
<!--[if gte mso 9]>
</div>
<![endif]-->
</div> </div>
</td> </td>