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

Merge pull request #815 from joshuadwire/enterprise-plan

Browse Source 
Enterprise plan bug fixes
This commit is contained in:
Hillel Coren 2016-04-19 17:40:17 +03:00
commit fb975db1f2
5 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/AccountController.php
View File

@ -1132,7 +1132,7 @@ class AccountController extends BaseController
$user->registered = true; $user->registered = true;
$user->save(); $user->save();
$user->account->startTrial(PLAN_ENTERPRISE); $user->account->startTrial(PLAN_PRO);
if (Input::get('go_pro') == 'true') { if (Input::get('go_pro') == 'true') {
Session::set(REQUESTED_PRO_PLAN, true); Session::set(REQUESTED_PRO_PLAN, true);

2
app/Http/routes.php
View File

@ -189,7 +189,7 @@ Route::group([
Route::post('users/bulk', 'UserController@bulk'); Route::post('users/bulk', 'UserController@bulk');
Route::get('send_confirmation/{user_id}', 'UserController@sendConfirmation'); Route::get('send_confirmation/{user_id}', 'UserController@sendConfirmation');
Route::get('start_trial/{plan}', 'AccountController@startTrial') Route::get('start_trial/{plan}', 'AccountController@startTrial')
->where(['plan'=>'pro|enterprise']); ->where(['plan'=>'pro']);
Route::get('restore_user/{user_id}', 'UserController@restoreUser'); Route::get('restore_user/{user_id}', 'UserController@restoreUser');
Route::post('users/change_password', 'UserController@changePassword'); Route::post('users/change_password', 'UserController@changePassword');
Route::get('/switch_account/{user_id}', 'UserController@switchAccount'); Route::get('/switch_account/{user_id}', 'UserController@switchAccount');

13
app/Models/Account.php
View File

@ -799,6 +799,14 @@ class Account extends Eloquent
$planDetails = $this->getPlanDetails(); $planDetails = $this->getPlanDetails();
$selfHost = !Utils::isNinjaProd(); $selfHost = !Utils::isNinjaProd();
if (!$selfHost && function_exists('ninja_account_features')) {
$result = ninja_account_features($this, $feature);
if ($result != null) {
return $result;
}
}
switch ($feature) { switch ($feature) {
// Pro // Pro
case FEATURE_CUSTOMIZE_INVOICE_DESIGN: case FEATURE_CUSTOMIZE_INVOICE_DESIGN:
@ -829,10 +837,6 @@ class Account extends Eloquent
case FEATURE_CLIENT_PORTAL_CSS: case FEATURE_CLIENT_PORTAL_CSS:
return !empty($planDetails);// A plan is required even for self-hosted users return !empty($planDetails);// A plan is required even for self-hosted users
// Enterprise
case FEATURE_DOCUMENTS:
return $selfHost || !empty($planDetails) && $planDetails['plan'] == PLAN_ENTERPRISE;
// Enterprise; No Trial allowed; grandfathered for old pro users // Enterprise; No Trial allowed; grandfathered for old pro users
case FEATURE_USERS:// Grandfathered for old Pro users case FEATURE_USERS:// Grandfathered for old Pro users
if($planDetails && $planDetails['trial']) { if($planDetails && $planDetails['trial']) {
@ -843,6 +847,7 @@ class Account extends Eloquent
return $selfHost || !empty($planDetails) && ($planDetails['plan'] == PLAN_ENTERPRISE || $planDetails['started'] <= date_create(PRO_USERS_GRANDFATHER_DEADLINE)); return $selfHost || !empty($planDetails) && ($planDetails['plan'] == PLAN_ENTERPRISE || $planDetails['started'] <= date_create(PRO_USERS_GRANDFATHER_DEADLINE));
// Enterprise; No Trial allowed // Enterprise; No Trial allowed
case FEATURE_DOCUMENTS:
case FEATURE_USER_PERMISSIONS: case FEATURE_USER_PERMISSIONS:
return $selfHost || !empty($planDetails) && $planDetails['plan'] == PLAN_ENTERPRISE && !$planDetails['trial']; return $selfHost || !empty($planDetails) && $planDetails['plan'] == PLAN_ENTERPRISE && !$planDetails['trial'];

2
app/Ninja/Repositories/AccountRepository.php
View File

@ -382,7 +382,7 @@ class AccountRepository
$user->last_name = $lastName; $user->last_name = $lastName;
$user->registered = true; $user->registered = true;
$user->account->startTrial(PLAN_ENTERPRISE); $user->account->startTrial(PLAN_PRO);
} }
$user->oauth_provider_id = $providerId; $user->oauth_provider_id = $providerId;

10
database/migrations/2016_04_16_103943_enterprise_plan.php
View File

@ -46,11 +46,11 @@ class EnterprisePlan extends Migration
$single_account_ids = \DB::table('users') $single_account_ids = \DB::table('users')
->leftJoin('user_accounts', function ($join) { ->leftJoin('user_accounts', function ($join) {
$join->on('user_Accounts.user_id1', '=', 'users.id'); $join->on('user_accounts.user_id1', '=', 'users.id');
$join->orOn('user_Accounts.user_id2', '=', 'users.id'); $join->orOn('user_accounts.user_id2', '=', 'users.id');
$join->orOn('user_Accounts.user_id3', '=', 'users.id'); $join->orOn('user_accounts.user_id3', '=', 'users.id');
$join->orOn('user_Accounts.user_id4', '=', 'users.id'); $join->orOn('user_accounts.user_id4', '=', 'users.id');
$join->orOn('user_Accounts.user_id5', '=', 'users.id'); $join->orOn('user_accounts.user_id5', '=', 'users.id');
}) })
->whereNull('user_accounts.id') ->whereNull('user_accounts.id')
->where(function ($query) { ->where(function ($query) {