Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7509 from turbo124/v5-develop

Browse Source 
Fixes for email formatting in Microsoft Outlook.
This commit is contained in:
David Bomba 2022-06-03 19:06:58 +10:00 committed by GitHub
commit 5c575e18e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 50 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Export/CSV/QuoteItemExport.php
View File

@ -78,7 +78,7 @@ class QuoteItemExport extends BaseExport
'tax_name2' => 'item.tax_name2', 'tax_name2' => 'item.tax_name2',
'tax_name3' => 'item.tax_name3', 'tax_name3' => 'item.tax_name3',
'line_total' => 'item.line_total', 'line_total' => 'item.line_total',
'gross_line_total' => 'item.gross_line_total', // 'gross_line_total' => 'item.gross_line_total',
'custom_value1' => 'item.custom_value1', 'custom_value1' => 'item.custom_value1',
'custom_value2' => 'item.custom_value2', 'custom_value2' => 'item.custom_value2',
'custom_value3' => 'item.custom_value3', 'custom_value3' => 'item.custom_value3',

36
app/Http/Controllers/SelfUpdateController.php
View File

@ -135,30 +135,30 @@ class SelfUpdateController extends BaseController
nlog("Extracting zip"); nlog("Extracting zip");
try{ // try{
$s = new Snappdf; // $s = new Snappdf;
$s->getChromiumPath(); // $s->getChromiumPath();
chmod($this->generatePlatformExecutable($s->getChromiumPath()), 0755); // chmod($this->generatePlatformExecutable($s->getChromiumPath()), 0755);
} // }
catch(\Exception $e){ // catch(\Exception $e){
nlog("I could not set the file permissions for chrome"); // nlog("I could not set the file permissions for chrome");
} // }
// $zipFile = new \PhpZip\ZipFile(); $zipFile = new \PhpZip\ZipFile();
// $zipFile->openFile($file); $zipFile->openFile($file);
// $zipFile->extractTo(base_path()); $zipFile->extractTo(base_path());
// $zipFile->close(); $zipFile->close();
$zip = new \ZipArchive; // $zip = new \ZipArchive;
$res = $zip->open($file); // $res = $zip->open($file);
if ($res === TRUE) { // if ($res === TRUE) {
$zip->extractTo(base_path()); // $zip->extractTo(base_path());
$zip->close(); // $zip->close();
} // }
nlog("Finished extracting files"); nlog("Finished extracting files");

2
app/Models/Client.php
View File

@ -666,8 +666,6 @@ class Client extends BaseModel implements HasLocalePreference
$offset -= $timezone->utc_offset; $offset -= $timezone->utc_offset;
$offset += ($entity_send_time * 3600); $offset += ($entity_send_time * 3600);
nlog("offset = {$offset}");
return $offset; return $offset;
} }

17
resources/views/email/template/admin.blade.php
View File

@ -117,13 +117,20 @@
</div> </div>
</tr> </tr>
<tr> <tr>
<td> <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;">
<img class="logo-light"
style="margin-top: 20px; max-width: 155px; display: block; margin-left: auto; margin-right: auto; " <!--[if gte mso 9]>
src="{{ $logo ?? '' }}" <img src="{{ $logo ?? '' }}" alt="" width="155" border="0" align="middle" style="display:block;" />
width="155" /> <div style="mso-hide:all;">
<![endif]-->
<img class="logo-light" src="{{ $logo ?? '' }}" alt="" style="margin-top: 20px; max-width: 155px; display: block; margin-left: auto; margin-right: auto;"/>
<!--[if gte mso 9]>
</div>
<![endif]-->
</div> </div>
</td> </td>
</tr> </tr>

27
resources/views/email/template/client.blade.php
View File

@ -94,19 +94,24 @@
<div style="text-align: center;margin-top: 25px; margin-bottom: 10px;"></div> <div style="text-align: center;margin-top: 25px; margin-bottom: 10px;"></div>
</tr> </tr>
<tr> <tr>
<td> <td align="center" cellpadding="20">
<div <div
style="border: 1px solid #c2c2c2; border-bottom: none; padding-bottom: 10px; border-top-left-radius: 3px; border-top-right-radius: 3px;"> style="border: 1px solid #c2c2c2; border-bottom: none; padding-bottom: 10px; border-top-left-radius: 3px; border-top-right-radius: 3px;">
<img <!--[if gte mso 9]>
style="margin-top: 40px; height: 40px; display: block; margin-left: auto; margin-right: auto;" <img src="{{ $logo ?? '' }}" alt="" width="400" border="0" align="middle" style="display:block;" />
alt="" <div style="mso-hide:all;">
src="{{ $logo ?? '' }}"/> <![endif]-->
<img src="{{ $logo ?? '' }}" alt="" style="margin-top: 40px; display: block; margin-left: auto; margin-right: auto;"/>
<!--[if gte mso 9]>
</div>
<![endif]-->
</div> </div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td cellpadding="20">
<div style="border: 1px solid #c2c2c2; border-top: none; border-bottom: none; padding: 20px; text-align: center" id="content"> <div style="border: 1px solid #c2c2c2; border-top: none; border-bottom: none; padding: 20px; text-align: center" id="content">
<div style="padding-top: 10px;"></div> <div style="padding-top: 10px;"></div>
@ -120,10 +125,16 @@
</div> </div>
</div> </div>
</td> </td>
</tr>
<tr>
<td height="20">
<div style="border: 1px solid #c2c2c2; border-top: none; border-bottom: none; padding: 20px; text-align: center" id="content"> </div>
</td>
</tr> </tr>
<tr> <tr>
<td> <td cellpadding="20" bgcolor="#f9f9f9">
<div class="dark-bg dark-text-white" <div class="dark-bg dark-text-white"
style="text-align: center; padding-top: 10px; padding-bottom: 25px; background-color: #f9f9f9; border: 1px solid #c2c2c2; border-top: none; border-bottom-color: #f9f9f9;"> style="text-align: center; padding-top: 10px; padding-bottom: 25px; background-color: #f9f9f9; border: 1px solid #c2c2c2; border-top: none; border-bottom-color: #f9f9f9;">
@isset($signature) @isset($signature)
@ -145,7 +156,7 @@
</tr> </tr>
<tr> <tr>
<td> <td bgcolor="#242424" cellpadding="20">
<div class="dark-bg-base" <div class="dark-bg-base"
style="padding-top: 10px;padding-bottom: 10px; background-color: #242424; border: 1px solid #c2c2c2; border-top-color: #242424; border-bottom-color: #242424;"> style="padding-top: 10px;padding-bottom: 10px; background-color: #242424; border: 1px solid #c2c2c2; border-top-color: #242424; border-bottom-color: #242424;">
@if(isset($company)) @if(isset($company))