Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 21:22:58 +01:00
Code Issues Releases Activity

Merge pull request #6266 from turbo124/v5-develop

Browse Source 
fixes for trial_started
This commit is contained in:
David Bomba 2021-07-14 17:16:20 +10:00 committed by GitHub
commit 539c8646e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/CompanyController.php
View File

@ -581,4 +581,9 @@ class CompanyController extends BaseController
return $this->itemResponse($company->fresh());
}
// public function default(DefaultCompanyRequest $request, Company $company)
// {
// }
}

2
app/Models/Account.php
View File

@ -261,7 +261,7 @@ class Account extends BaseModel
if ($trial_plan && $include_trial) {
$trial_started = $this->trial_started;
$trial_expires = $this->trial_started->addSeconds($this->trial_duration);
$trial_expires = Carbon::parse($this->trial_started)->addSeconds($this->trial_duration);
if($trial_expires->greaterThan(now())){
$trial_active = true;