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

Track plan start date when manually applying a license

Browse Source
This commit is contained in:
Hillel Coren 2016-05-09 15:07:01 +03:00
parent 9b0f086cbd
commit 8bd2e84bc8
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/Http/Controllers/PaymentController.php
View File

@ -348,9 +348,18 @@ class PaymentController extends BaseController
$license->save(); $license->save();
} }
return $productId == PRODUCT_INVOICE_DESIGNS ? file_get_contents(storage_path() . '/invoice_designs.txt') : 'valid'; if ($productId == PRODUCT_INVOICE_DESIGNS) {
return file_get_contents(storage_path() . '/invoice_designs.txt');
} else {
// temporary fix to enable previous version to work
if (Input::get('get_date')) {
return $license->created_at->format('Y-m-d');
} else {
return 'valid';
}
}
} else { } else {
return 'invalid'; return RESULT_FAILURE;
} }
} }

9
app/Http/Middleware/StartupCheck.php
View File

@ -124,7 +124,8 @@ class StartupCheck
$licenseKey = Input::get('license_key'); $licenseKey = Input::get('license_key');
$productId = Input::get('product_id'); $productId = Input::get('product_id');
$data = trim(file_get_contents((Utils::isNinjaDev() ? SITE_URL : NINJA_APP_URL)."/claim_license?license_key={$licenseKey}&product_id={$productId}")); $url = (Utils::isNinjaDev() ? SITE_URL : NINJA_APP_URL) . "/claim_license?license_key={$licenseKey}&product_id={$productId}&get_date=true";
$data = trim(file_get_contents($url));
if ($productId == PRODUCT_INVOICE_DESIGNS) { if ($productId == PRODUCT_INVOICE_DESIGNS) {
if ($data = json_decode($data)) { if ($data = json_decode($data)) {
@ -140,11 +141,11 @@ class StartupCheck
Session::flash('message', trans('texts.bought_designs')); Session::flash('message', trans('texts.bought_designs'));
} }
} elseif ($productId == PRODUCT_WHITE_LABEL) { } elseif ($productId == PRODUCT_WHITE_LABEL) {
if ($data == 'valid') { if ($data && $data != RESULT_FAILURE) {
$company = Auth::user()->account->company; $company = Auth::user()->account->company;
$company->plan_term = PLAN_TERM_YEARLY; $company->plan_term = PLAN_TERM_YEARLY;
$company->plan_paid = date_create()->format('Y-m-d'); $company->plan_paid = $data;
$company->plan_expires = date_create()->modify('+1 year')->format('Y-m-d'); $company->plan_expires = date_create($data)->modify('+1 year')->format('Y-m-d');
$company->plan = PLAN_WHITE_LABEL; $company->plan = PLAN_WHITE_LABEL;
$company->save(); $company->save();