Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 18:00:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

changes according to: https://github.com/invoiceninja/invoiceninja/pull/9042#discussion_r1432330656

Browse Source
This commit is contained in:
paulwer 2023-12-28 10:18:24 +01:00
parent 77a615adb6
commit ad009b5837
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Requests/Company/StoreCompanyRequest.php
View File

@ -56,7 +56,7 @@ class StoreCompanyRequest extends Request
} }
} }
$rules['expense_mailbox'] = new ValidExpenseMailbox($this->company->key, $this->company->account->isPaid() && $this->company->account->plan == 'enterprise'); // @turbo124 check if this is right $rules['expense_mailbox'] = new ValidExpenseMailbox($this->company->key);
return $rules; return $rules;
} }
@ -77,6 +77,10 @@ class StoreCompanyRequest extends Request
$input['portal_domain'] = rtrim(strtolower($input['portal_domain']), "/"); $input['portal_domain'] = rtrim(strtolower($input['portal_domain']), "/");
} }
if (isset($input['expense_mailbox']) && Ninja::isHosted() && !($this->company->account->isPaid() && $this->company->account->plan == 'enterprise')) {
unset($input['expense_mailbox']);
}
$this->replace($input); $this->replace($input);
} }
} }

11
app/Http/ValidationRules/Company/ValidExpenseMailbox.php
View File

@ -21,7 +21,6 @@ use Illuminate\Contracts\Validation\Rule;
class ValidExpenseMailbox implements Rule class ValidExpenseMailbox implements Rule
{ {
private $is_enterprise_error = false;
private $validated_schema = false; private $validated_schema = false;
private $company_key = false; private $company_key = false;
private $isEnterprise = false; private $isEnterprise = false;
@ -32,7 +31,6 @@ class ValidExpenseMailbox implements Rule
public function __construct(string $company_key, bool $isEnterprise = false) public function __construct(string $company_key, bool $isEnterprise = false)
{ {
$this->company_key = $company_key; $this->company_key = $company_key;
$this->isEnterprise = $isEnterprise;
$this->endings = explode(",", config('ninja.ingest_mail.expense_mailbox_endings')); $this->endings = explode(",", config('ninja.ingest_mail.expense_mailbox_endings'));
} }
@ -42,12 +40,6 @@ class ValidExpenseMailbox implements Rule
return true; return true;
} }
// denie on hosted and not enterprise
if (Ninja::isHosted() && !$this->isEnterprise) {
$this->is_enterprise_error = true;
return false;
}
// early return, if we dont have any additional validation // early return, if we dont have any additional validation
if (!config('ninja.ingest_mail.expense_mailbox_endings')) { if (!config('ninja.ingest_mail.expense_mailbox_endings')) {
$this->validated_schema = true; $this->validated_schema = true;
@ -75,9 +67,6 @@ class ValidExpenseMailbox implements Rule
*/ */
public function message() public function message()
{ {
if ($this->is_enterprise_error)
return ctrans('texts.expense_mailbox_not_available');
if (!$this->validated_schema) if (!$this->validated_schema)
return ctrans('texts.expense_mailbox_invalid'); return ctrans('texts.expense_mailbox_invalid');