From dbcf32da26dbbdc8c2f8a8a913eea2fdf0eb5484 Mon Sep 17 00:00:00 2001 From: paulwer Date: Sun, 30 Jun 2024 13:06:30 +0200 Subject: [PATCH] minor fixes --- app/Services/EDocument/Imports/ParseEDocument.php | 2 +- app/Services/InboundMail/InboundMailEngine.php | 7 +++++++ app/Transformers/CompanyTransformer.php | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/Services/EDocument/Imports/ParseEDocument.php b/app/Services/EDocument/Imports/ParseEDocument.php index b790caaf026c..39d0b4cd99cd 100644 --- a/app/Services/EDocument/Imports/ParseEDocument.php +++ b/app/Services/EDocument/Imports/ParseEDocument.php @@ -58,7 +58,7 @@ class ParseEDocument extends AbstractService } // MINDEE OCR - try to parse via mindee external service - if (config('services.mindee.api_key') && (Ninja::isSelfHost() || (Ninja::isHosted() && $account->isPaid() && $account->plan == 'enterprise'))) + if (config('services.mindee.api_key') && !(Ninja::isHosted() && !($this->company->account->isPaid() && $this->company->account->plan == 'enterprise'))) try { return (new MindeeEDocument($this->file))->run(); } catch (Exception $e) { diff --git a/app/Services/InboundMail/InboundMailEngine.php b/app/Services/InboundMail/InboundMailEngine.php index bd3b95d865d7..979ab57a73be 100644 --- a/app/Services/InboundMail/InboundMailEngine.php +++ b/app/Services/InboundMail/InboundMailEngine.php @@ -20,6 +20,7 @@ use App\Models\SystemLog; use App\Models\VendorContact; use App\Services\EDocument\Imports\ParseEDocument; use App\Services\InboundMail\InboundMail; +use App\Utils\Ninja; use App\Utils\TempFile; use App\Utils\Traits\GeneratesCounter; use App\Utils\Traits\SavesDocuments; @@ -57,6 +58,12 @@ class InboundMailEngine return; } + // check if company plan matches requirements + if (Ninja::isHosted() && !($company->account->isPaid() && $company->account->plan == 'enterprise')) { + $this->saveMeta($email->from, $email->to); + return; + } + $this->createExpenses($company, $email); $this->saveMeta($email->from, $email->to); } diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php index 183253f5d923..87d61a8d7fe7 100644 --- a/app/Transformers/CompanyTransformer.php +++ b/app/Transformers/CompanyTransformer.php @@ -204,7 +204,7 @@ class CompanyTransformer extends EntityTransformer 'invoice_task_project_header' => (bool) $company->invoice_task_project_header, 'invoice_task_item_description' => (bool) $company->invoice_task_item_description, 'origin_tax_data' => $company->origin_tax_data ?: new \stdClass, - 'expense_mailbox' => (bool) $company->expense_mailbox, + 'expense_mailbox' => (string) $company->expense_mailbox, 'expense_mailbox_active' => (bool) $company->expense_mailbox_active, 'inbound_mailbox_allow_company_users' => (bool) $company->inbound_mailbox_allow_company_users, 'inbound_mailbox_allow_vendors' => (bool) $company->inbound_mailbox_allow_vendors,