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

minor fixes

Browse Source
This commit is contained in:
paulwer 2024-06-30 13:06:30 +02:00
parent 19cdfcf094
commit dbcf32da26
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Services/EDocument/Imports/ParseEDocument.php
View File

@ -58,7 +58,7 @@ class ParseEDocument extends AbstractService
} }
// MINDEE OCR - try to parse via mindee external service // 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 { try {
return (new MindeeEDocument($this->file))->run(); return (new MindeeEDocument($this->file))->run();
} catch (Exception $e) { } catch (Exception $e) {

7
app/Services/InboundMail/InboundMailEngine.php
View File

@ -20,6 +20,7 @@ use App\Models\SystemLog;
use App\Models\VendorContact; use App\Models\VendorContact;
use App\Services\EDocument\Imports\ParseEDocument; use App\Services\EDocument\Imports\ParseEDocument;
use App\Services\InboundMail\InboundMail; use App\Services\InboundMail\InboundMail;
use App\Utils\Ninja;
use App\Utils\TempFile; use App\Utils\TempFile;
use App\Utils\Traits\GeneratesCounter; use App\Utils\Traits\GeneratesCounter;
use App\Utils\Traits\SavesDocuments; use App\Utils\Traits\SavesDocuments;
@ -57,6 +58,12 @@ class InboundMailEngine
return; 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->createExpenses($company, $email);
$this->saveMeta($email->from, $email->to); $this->saveMeta($email->from, $email->to);
} }

2
app/Transformers/CompanyTransformer.php
View File

@ -204,7 +204,7 @@ class CompanyTransformer extends EntityTransformer
'invoice_task_project_header' => (bool) $company->invoice_task_project_header, 'invoice_task_project_header' => (bool) $company->invoice_task_project_header,
'invoice_task_item_description' => (bool) $company->invoice_task_item_description, 'invoice_task_item_description' => (bool) $company->invoice_task_item_description,
'origin_tax_data' => $company->origin_tax_data ?: new \stdClass, '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, 'expense_mailbox_active' => (bool) $company->expense_mailbox_active,
'inbound_mailbox_allow_company_users' => (bool) $company->inbound_mailbox_allow_company_users, 'inbound_mailbox_allow_company_users' => (bool) $company->inbound_mailbox_allow_company_users,
'inbound_mailbox_allow_vendors' => (bool) $company->inbound_mailbox_allow_vendors, 'inbound_mailbox_allow_vendors' => (bool) $company->inbound_mailbox_allow_vendors,