diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 6587ef6d02e4..93c44c99afb7 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -109,10 +109,11 @@ class Handler extends ExceptionHandler Integration::configureScope(function (Scope $scope): void { $name = 'hosted@invoiceninja.com'; - if (auth()->guard('contact') && auth()->guard('contact')->user()) { + if (auth()->guard('contact') && auth()->guard('contact')->user()) { // @phpstan-ignore-line $name = 'Contact = '.auth()->guard('contact')->user()->email; $key = auth()->guard('contact')->user()->company->account->key; - } elseif (auth()->guard('user') && auth()->guard('user')->user()) { + } elseif (auth()->guard('user') && auth()->guard('user')->user()) { // @phpstan-ignore-line + $name = 'Admin = '.auth()->guard('user')->user()->email; $key = auth()->user()->account->key; } else { @@ -131,13 +132,14 @@ class Handler extends ExceptionHandler } } elseif (app()->bound('sentry')) { Integration::configureScope(function (Scope $scope): void { - if (auth()->guard('contact') && auth()->guard('contact')->user() && auth()->guard('contact')->user()->company->account->report_errors) { + if (auth()->guard('contact') && auth()->guard('contact')->user() && auth()->guard('contact')->user()->company->account->report_errors) {// @phpstan-ignore-line + $scope->setUser([ 'id' => auth()->guard('contact')->user()->company->account->key, 'email' => 'anonymous@example.com', 'name' => 'Anonymous User', ]); - } elseif (auth()->guard('user') && auth()->guard('user')->user() && auth()->user()->companyIsSet() && auth()->user()->company()->account->report_errors) { + } elseif (auth()->guard('user') && auth()->guard('user')->user() && auth()->user()->companyIsSet() && auth()->user()->company()->account->report_errors) {// @phpstan-ignore-line $scope->setUser([ 'id' => auth()->user()->account->key, 'email' => 'anonymous@example.com', diff --git a/app/Export/CSV/ActivityExport.php b/app/Export/CSV/ActivityExport.php index 81c531cb464a..96d3b98106f5 100644 --- a/app/Export/CSV/ActivityExport.php +++ b/app/Export/CSV/ActivityExport.php @@ -25,8 +25,6 @@ use League\Csv\Writer; class ActivityExport extends BaseExport { - private $entity_transformer; - public string $date_key = 'created_at'; private string $date_format = 'YYYY-MM-DD'; @@ -43,7 +41,7 @@ class ActivityExport extends BaseExport { $this->company = $company; $this->input = $input; - $this->entity_transformer = new ActivityTransformer(); + } public function returnJson() @@ -143,10 +141,10 @@ class ActivityExport extends BaseExport } - private function decorateAdvancedFields(Task $task, array $entity): array - { - return $entity; - } + // private function decorateAdvancedFields(Task $task, array $entity): array + // { + // return $entity; + // } public function processMetaData(array $row, $resource): array diff --git a/app/Export/CSV/BaseExport.php b/app/Export/CSV/BaseExport.php index 11d92f15df94..2ecdce7c4170 100644 --- a/app/Export/CSV/BaseExport.php +++ b/app/Export/CSV/BaseExport.php @@ -971,9 +971,10 @@ class BaseExport protected function addPaymentStatusFilters(Builder $query, string $status): Builder { + /** @var array $status_parameters */ $status_parameters = explode(',', $status); - if(in_array('all', $status_parameters) || count($status_parameters) == 0) { + if((count($status_parameters) == 0) || in_array('all', $status_parameters)) { return $query; } @@ -1028,6 +1029,7 @@ class BaseExport protected function addRecurringInvoiceStatusFilter(Builder $query, string $status): Builder { + /** @var array $status_parameters */ $status_parameters = explode(',', $status); if (in_array('all', $status_parameters) || count($status_parameters) == 0) { @@ -1132,6 +1134,7 @@ class BaseExport protected function addPurchaseOrderStatusFilter(Builder $query, string $status): Builder { + /** @var array $status_parameters */ $status_parameters = explode(',', $status); if (in_array('all', $status_parameters) || count($status_parameters) == 0) { @@ -1179,7 +1182,8 @@ class BaseExport */ protected function addInvoiceStatusFilter(Builder $query, string $status): Builder { - + + /** @var array $status_parameters */ $status_parameters = explode(',', $status); if(in_array('all', $status_parameters) || count($status_parameters) == 0) { diff --git a/app/Export/CSV/ClientExport.php b/app/Export/CSV/ClientExport.php index 4b27fb45df62..8732f9800eef 100644 --- a/app/Export/CSV/ClientExport.php +++ b/app/Export/CSV/ClientExport.php @@ -243,16 +243,16 @@ class ClientExport extends BaseExport return $entity; } - private function calculateStatus($client) - { - if ($client->is_deleted) { - return ctrans('texts.deleted'); - } + // private function calculateStatus($client) + // { + // if ($client->is_deleted) { + // return ctrans('texts.deleted'); + // } - if ($client->deleted_at) { - return ctrans('texts.archived'); - } + // if ($client->deleted_at) { + // return ctrans('texts.archived'); + // } - return ctrans('texts.active'); - } + // return ctrans('texts.active'); + // } } diff --git a/app/Export/CSV/ContactExport.php b/app/Export/CSV/ContactExport.php index 12ea78384c6e..f21fb8157018 100644 --- a/app/Export/CSV/ContactExport.php +++ b/app/Export/CSV/ContactExport.php @@ -155,7 +155,7 @@ class ContactExport extends BaseExport } if (in_array('client.user_id', $this->input['report_keys'])) { - $entity['client.user_id'] = $client->user ? $client->user->present()->name() : ''; + $entity['client.user_id'] = $client->user ? $client->user->present()->name() : '';// @phpstan-ignore-line } if (in_array('client.assigned_user_id', $this->input['report_keys'])) { diff --git a/app/Export/CSV/ProductExport.php b/app/Export/CSV/ProductExport.php index a572825a3e72..48d76b8577d2 100644 --- a/app/Export/CSV/ProductExport.php +++ b/app/Export/CSV/ProductExport.php @@ -133,16 +133,16 @@ class ProductExport extends BaseExport // return $this->decorateAdvancedFields($product, $entity); } - private function decorateAdvancedFields(Product $product, array $entity): array - { - if (in_array('vendor_id', $this->input['report_keys'])) { - $entity['vendor'] = $product->vendor()->exists() ? $product->vendor->name : ''; - } + // private function decorateAdvancedFields(Product $product, array $entity): array + // { + // if (in_array('vendor_id', $this->input['report_keys'])) { + // $entity['vendor'] = $product->vendor()->exists() ? $product->vendor->name : ''; + // } - // if (array_key_exists('project_id', $this->input['report_keys'])) { - // $entity['project'] = $product->project()->exists() ? $product->project->name : ''; - // } + // // if (array_key_exists('project_id', $this->input['report_keys'])) { + // // $entity['project'] = $product->project()->exists() ? $product->project->name : ''; + // // } - return $entity; - } + // return $entity; + // } } diff --git a/app/Export/CSV/ProductSalesExport.php b/app/Export/CSV/ProductSalesExport.php index 74c7b71ffec1..7b5eb83a243d 100644 --- a/app/Export/CSV/ProductSalesExport.php +++ b/app/Export/CSV/ProductSalesExport.php @@ -66,11 +66,11 @@ class ProductSalesExport extends BaseExport 'custom_value4' => 'custom_value4', ]; - private array $decorate_keys = [ - 'client', - 'currency', - 'date', - ]; + // private array $decorate_keys = [ + // 'client', + // 'currency', + // 'date', + // ]; public function __construct(Company $company, array $input) { @@ -330,8 +330,8 @@ class ProductSalesExport extends BaseExport * @param string $product_key * @return ?\Illuminate\Database\Eloquent\Model */ - private function getProduct(string $product_key) - { - return $this->products->firstWhere('product_key', $product_key); - } + // private function getProduct(string $product_key) + // { + // return $this->products->firstWhere('product_key', $product_key); + // } }