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

Fixes for plan_expires type casting

Browse Source
This commit is contained in:
David Bomba 2021-07-11 14:54:57 +10:00
parent 75d012af06
commit a2d0965ed5
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/LicenseController.php
View File

@ -16,6 +16,7 @@ use App\Utils\CurlUtils;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Http\Response; use Illuminate\Http\Response;
use stdClass; use stdClass;
use Carbon\Carbon;
class LicenseController extends BaseController class LicenseController extends BaseController
{ {
@ -152,7 +153,7 @@ class LicenseController extends BaseController
{ {
$account = auth()->user()->company()->account; $account = auth()->user()->company()->account;
if($account->plan == 'white_label' && $account->plan_expires->lt(now())){ if($account->plan == 'white_label' && Carbon::parse($account->plan_expires)->lt(now())){
$account->plan = null; $account->plan = null;
$account->plan_expires = null; $account->plan_expires = null;
$account->save(); $account->save();

3
app/Jobs/Util/VersionCheck.php
View File

@ -18,6 +18,7 @@ use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels; use Illuminate\Queue\SerializesModels;
use Carbon\Carbon;
class VersionCheck implements ShouldQueue class VersionCheck implements ShouldQueue
{ {
@ -49,7 +50,7 @@ class VersionCheck implements ShouldQueue
if(!$account) if(!$account)
return; return;
if($account->plan == 'white_label' && $account->plan_expires && $account->plan_expires->lt(now())){ if($account->plan == 'white_label' && $account->plan_expires && Carbon::parse($account->plan_expires)->lt(now())){
$account->plan = null; $account->plan = null;
$account->plan_expires = null; $account->plan_expires = null;
$account->save(); $account->save();

7
app/Models/Account.php
View File

@ -55,7 +55,7 @@ class Account extends BaseModel
'promo_expires', 'promo_expires',
'discount_expires', 'discount_expires',
'trial_started', 'trial_started',
'plan_expires' // 'plan_expires'
]; ];
const PLAN_FREE = 'free'; const PLAN_FREE = 'free';
@ -120,6 +120,11 @@ class Account extends BaseModel
return $this->hasMany(CompanyUser::class); return $this->hasMany(CompanyUser::class);
} }
public function owner()
{
return $this->hasMany(CompanyUser::class)->where('is_owner', true)->first() ? $this->hasMany(CompanyUser::class)->where('is_owner', true)->first()->user : false;
}
public function getPlan() public function getPlan()
{ {
return $this->plan ?: ''; return $this->plan ?: '';

4
app/Models/Presenters/UserPresenter.php
View File

@ -21,6 +21,10 @@ class UserPresenter extends EntityPresenter
*/ */
public function name() public function name()
{ {
if(!$this->entity)
return "No User Object Available";
$first_name = isset($this->entity->first_name) ? $this->entity->first_name : ''; $first_name = isset($this->entity->first_name) ? $this->entity->first_name : '';
$last_name = isset($this->entity->last_name) ? $this->entity->last_name : ''; $last_name = isset($this->entity->last_name) ? $this->entity->last_name : '';