From 3e8ad10efeb5cfb25bac0dd62509a43f36bb1c80 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 2 Jun 2022 16:42:37 +1000 Subject: [PATCH 01/25] Revert zip package --- app/Http/Controllers/SelfUpdateController.php | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/app/Http/Controllers/SelfUpdateController.php b/app/Http/Controllers/SelfUpdateController.php index 55a98d42a5c6..4f14a006b04b 100644 --- a/app/Http/Controllers/SelfUpdateController.php +++ b/app/Http/Controllers/SelfUpdateController.php @@ -135,30 +135,30 @@ class SelfUpdateController extends BaseController nlog("Extracting zip"); - try{ - $s = new Snappdf; - $s->getChromiumPath(); - chmod($this->generatePlatformExecutable($s->getChromiumPath()), 0755); - } - catch(\Exception $e){ - nlog("I could not set the file permissions for chrome"); - } + // try{ + // $s = new Snappdf; + // $s->getChromiumPath(); + // chmod($this->generatePlatformExecutable($s->getChromiumPath()), 0755); + // } + // catch(\Exception $e){ + // 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); - if ($res === TRUE) { - $zip->extractTo(base_path()); - $zip->close(); - } + // $res = $zip->open($file); + // if ($res === TRUE) { + // $zip->extractTo(base_path()); + // $zip->close(); + // } nlog("Finished extracting files"); From af9b578a7e94bfe4d5930c61ae899e5b1e603cf4 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 3 Jun 2022 12:36:30 +1000 Subject: [PATCH 02/25] Minor fixes for exports --- app/Export/CSV/QuoteItemExport.php | 2 +- app/Models/Client.php | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/Export/CSV/QuoteItemExport.php b/app/Export/CSV/QuoteItemExport.php index fb00ab918877..ad1ded90ca73 100644 --- a/app/Export/CSV/QuoteItemExport.php +++ b/app/Export/CSV/QuoteItemExport.php @@ -78,7 +78,7 @@ class QuoteItemExport extends BaseExport 'tax_name2' => 'item.tax_name2', 'tax_name3' => 'item.tax_name3', '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_value2' => 'item.custom_value2', 'custom_value3' => 'item.custom_value3', diff --git a/app/Models/Client.php b/app/Models/Client.php index 2a00e87ff2b7..7a4e00c1753b 100644 --- a/app/Models/Client.php +++ b/app/Models/Client.php @@ -666,8 +666,6 @@ class Client extends BaseModel implements HasLocalePreference $offset -= $timezone->utc_offset; $offset += ($entity_send_time * 3600); - - nlog("offset = {$offset}"); return $offset; } From ef492cecdd3c41d7c9414f33fd1302c52ea2d957 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 3 Jun 2022 13:50:50 +1000 Subject: [PATCH 03/25] Fixes for email images in outlook --- resources/views/email/template/client.blade.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/resources/views/email/template/client.blade.php b/resources/views/email/template/client.blade.php index 48d85088224d..21bf49fffa1e 100644 --- a/resources/views/email/template/client.blade.php +++ b/resources/views/email/template/client.blade.php @@ -98,10 +98,21 @@
- + --}} + + + + +
From c61edc85d4680f04cda2be3cee275fad8e56c105 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 3 Jun 2022 13:56:51 +1000 Subject: [PATCH 04/25] Fixes for email images --- resources/views/email/template/client.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/email/template/client.blade.php b/resources/views/email/template/client.blade.php index 21bf49fffa1e..e98c538fba18 100644 --- a/resources/views/email/template/client.blade.php +++ b/resources/views/email/template/client.blade.php @@ -105,8 +105,8 @@ --}} - + From 3e8450dd02ed621467b7dee9433838df5e750b8f Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 3 Jun 2022 14:21:25 +1000 Subject: [PATCH 06/25] Fixes for email images --- resources/views/email/template/client.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/email/template/client.blade.php b/resources/views/email/template/client.blade.php index b07b8fd4b97b..3f6b079a1b00 100644 --- a/resources/views/email/template/client.blade.php +++ b/resources/views/email/template/client.blade.php @@ -105,7 +105,7 @@ --}} From 2c8a896a72e53b51a53d2221697893ef2272fb67 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 3 Jun 2022 14:29:42 +1000 Subject: [PATCH 07/25] Fixes for email images --- resources/views/email/template/client.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/email/template/client.blade.php b/resources/views/email/template/client.blade.php index 3f6b079a1b00..c2a595b464f3 100644 --- a/resources/views/email/template/client.blade.php +++ b/resources/views/email/template/client.blade.php @@ -94,7 +94,7 @@
- +
@@ -156,7 +156,7 @@ - +
@if(isset($company)) From 543e2e021d825506726281d1a4bd7aa6b8f957fd Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 3 Jun 2022 14:39:57 +1000 Subject: [PATCH 08/25] Fixes for email images --- resources/views/email/template/client.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/email/template/client.blade.php b/resources/views/email/template/client.blade.php index c2a595b464f3..68ed86c27626 100644 --- a/resources/views/email/template/client.blade.php +++ b/resources/views/email/template/client.blade.php @@ -106,7 +106,7 @@ - + From 8bd1d52dc795dda207163a37f180461290aafbf0 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 3 Jun 2022 16:50:48 +1000 Subject: [PATCH 23/25] Improve quality of email formatting for outlook --- resources/views/email/template/client.blade.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/resources/views/email/template/client.blade.php b/resources/views/email/template/client.blade.php index 01e5a7d9f8e4..4288ead2501c 100644 --- a/resources/views/email/template/client.blade.php +++ b/resources/views/email/template/client.blade.php @@ -98,12 +98,6 @@
-{{-- - --}} - + + + +