mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-06-22 18:00:56 -04:00
Fix for grandfathered check
This commit is contained in:
parent
8eda3badb8
commit
cb9a67063d
@ -1135,6 +1135,12 @@ class Account extends Eloquent
|
|||||||
|
|
||||||
switch ($feature) {
|
switch ($feature) {
|
||||||
// Pro
|
// Pro
|
||||||
|
case FEATURE_TASKS:
|
||||||
|
case FEATURE_EXPENSES:
|
||||||
|
if (Utils::isNinja() && $this->company_id < EXTRAS_GRANDFATHER_COMPANY_ID) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
case FEATURE_CUSTOMIZE_INVOICE_DESIGN:
|
case FEATURE_CUSTOMIZE_INVOICE_DESIGN:
|
||||||
case FEATURE_DIFFERENT_DESIGNS:
|
case FEATURE_DIFFERENT_DESIGNS:
|
||||||
case FEATURE_EMAIL_TEMPLATES_REMINDERS:
|
case FEATURE_EMAIL_TEMPLATES_REMINDERS:
|
||||||
@ -1150,10 +1156,6 @@ class Account extends Eloquent
|
|||||||
case FEATURE_CUSTOM_URL:
|
case FEATURE_CUSTOM_URL:
|
||||||
return $selfHost || !empty($planDetails);
|
return $selfHost || !empty($planDetails);
|
||||||
|
|
||||||
case FEATURE_TASKS:
|
|
||||||
case FEATURE_EXPENSES:
|
|
||||||
return $selfHost || !empty($planDetails) || $planDetails['company_id'] < EXTRAS_GRANDFATHER_COMPANY_ID;
|
|
||||||
|
|
||||||
// Pro; No trial allowed, unless they're trialing enterprise with an active pro plan
|
// Pro; No trial allowed, unless they're trialing enterprise with an active pro plan
|
||||||
case FEATURE_MORE_CLIENTS:
|
case FEATURE_MORE_CLIENTS:
|
||||||
return $selfHost || !empty($planDetails) && (!$planDetails['trial'] || !empty($this->getPlanDetails(false, false)));
|
return $selfHost || !empty($planDetails) && (!$planDetails['trial'] || !empty($this->getPlanDetails(false, false)));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user