From 21520d775a7af4fc92ccafbd517c8e5912fffd4e Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 5 Sep 2023 09:02:49 +1000
Subject: [PATCH] Cleanup for email history

---
 .../Controllers/EmailHistoryController.php    |  2 -
 app/Services/Client/EmailHistory.php          | 96 -------------------
 lang/en/texts.php                             |  1 +
 3 files changed, 1 insertion(+), 98 deletions(-)
 delete mode 100644 app/Services/Client/EmailHistory.php

diff --git a/app/Http/Controllers/EmailHistoryController.php b/app/Http/Controllers/EmailHistoryController.php
index e8f2d4894fda..42dea4c1625a 100644
--- a/app/Http/Controllers/EmailHistoryController.php
+++ b/app/Http/Controllers/EmailHistoryController.php
@@ -34,7 +34,6 @@ class EmailHistoryController extends BaseController
                  ->map(function ($system_log) {
                      if($system_log->log['history'] ?? false) {
                         return $system_log->log['history'];
-                        //  return json_decode($system_log->log['history'], true);
                      }
                  });
 
@@ -60,7 +59,6 @@ class EmailHistoryController extends BaseController
                 ->map(function ($system_log) {
                     if($system_log->log['history'] ?? false) {
                         return $system_log->log['history'];
-                        // return json_decode($system_log->log['history'], true);
                     }
                 });
 
diff --git a/app/Services/Client/EmailHistory.php b/app/Services/Client/EmailHistory.php
deleted file mode 100644
index f0715c49b3e3..000000000000
--- a/app/Services/Client/EmailHistory.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * Invoice Ninja (https://invoiceninja.com).
- *
- * @link https://github.com/invoiceninja/invoiceninja source repository
- *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
- *
- * @license https://www.elastic.co/licensing/elastic-license
- */
-
-namespace App\Services\Client;
-
-use App\Models\Client;
-use App\Models\SystemLog;
-use Postmark\PostmarkClient;
-use App\Services\AbstractService;
-
-/** @deprecated */
-class EmailHistory extends AbstractService
-{
-    private string $postmark_token;
-
-    private PostmarkClient $postmark;
-
-    private array $default_response = [
-            'subject' => 'Message not found.',
-            'status' => '',
-            'recipient' =>  '',
-            'type' => '',
-            'delivery_message' => '',
-            'server' => '',
-            'server_ip' => '',
-        ];
-
-    public function __construct(public Client $client)
-    {
-    }
-
-    public function run(): array
-    {
-        // $settings = $this->client->getMergedSettings();
-        
-        // if($settings->email_sending_method == 'default'){
-            // $this->postmark_token = config('services.postmark.token');
-        // }
-        // elseif($settings->email_sending_method == 'client_postmark'){
-        //     $this->postmark_token = $settings->postmark_secret;
-        // }
-        // else{
-        //     return [];
-        // }
-
-        // $this->postmark = new PostmarkClient($this->postmark_token);
-            
-        return SystemLog::query()
-                        ->where('client_id', $this->client->id)
-                        ->where('category_id', SystemLog::CATEGORY_MAIL)
-                        ->orderBy('id','DESC')
-                        ->cursor()
-                        ->map(function ($system_log) {
-                            
-                            if($system_log->log['history'] ?? false){
-                                return json_decode($system_log->log['history'],true);
-                            }
-                        })->toArray();
-    }
-
-    private function fetchMessage(string $message_id): array
-    {
-        if(strlen($message_id) < 1){
-            return $this->default_response;
-        } 
-    
-        try {
-        
-            $messageDetail = $this->postmark->getOutboundMessageDetails($message_id);
-                
-            return [
-                'subject' => $messageDetail->subject ?? '',
-                'status' => $messageDetail->status ?? '',
-                'recipient' => $messageDetail->messageevents[0]['Recipient'] ?? '',
-                'type' => $messageDetail->messageevents[0]->Type ?? '',
-                'delivery_message' => $messageDetail->messageevents[0]->Details->DeliveryMessage ?? '',
-                'server' => $messageDetail->messageevents[0]->Details->DestinationServer ?? '',
-                'server_ip' => $messageDetail->messageevents[0]->Details->DestinationIP ?? '',
-            ];
-        
-        }
-        catch (\Exception $e) {
-
-            return $this->default_response;
-
-        }
-    }
-}
\ No newline at end of file
diff --git a/lang/en/texts.php b/lang/en/texts.php
index b97c5cdf20fc..a5bc8f47feda 100644
--- a/lang/en/texts.php
+++ b/lang/en/texts.php
@@ -5160,6 +5160,7 @@ $LANG = array(
     'marked_sent_credits' => 'Successfully marked credits sent',
     'show_document_preview' => 'Show Document Preview',
     'cash_accounting' => 'Cash accounting',
+    'click_or_drop_files_here' => 'Click or drop files here',
 ); 
 
 return $LANG;