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

Bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2015-06-12 11:39:53 +03:00
parent df88339119
commit d34ed74863
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -725,10 +725,16 @@ class AccountController extends BaseController
{ {
$affiliate = Affiliate::where('affiliate_key', '=', SELF_HOST_AFFILIATE_KEY)->first(); $affiliate = Affiliate::where('affiliate_key', '=', SELF_HOST_AFFILIATE_KEY)->first();
$email = trim(Input::get('email'));
if (!$email || $email == 'user@example.com') {
return RESULT_SUCCESS;
}
$license = new License(); $license = new License();
$license->first_name = Input::get('first_name'); $license->first_name = Input::get('first_name');
$license->last_name = Input::get('last_name'); $license->last_name = Input::get('last_name');
$license->email = Input::get('email'); $license->email = $email;
$license->transaction_reference = Request::getClientIp(); $license->transaction_reference = Request::getClientIp();
$license->license_key = Utils::generateLicense(); $license->license_key = Utils::generateLicense();
$license->affiliate_id = $affiliate->id; $license->affiliate_id = $affiliate->id;
@ -736,7 +742,7 @@ class AccountController extends BaseController
$license->is_claimed = 1; $license->is_claimed = 1;
$license->save(); $license->save();
return ''; return RESULT_SUCCESS;
} }
public function cancelAccount() public function cancelAccount()

2
public/css/built.css vendored
View File

@ -3273,7 +3273,7 @@ button .glyphicon {
background-color: #4b4b4b; background-color: #4b4b4b;
padding-bottom: 40px; padding-bottom: 40px;
padding-right: 25px; padding-right: 25px;
/*opacity:0.96 !important;*/ opacity:0.95 !important;
} }
.pro-plan-modal .left-side { .pro-plan-modal .left-side {

2
public/css/style.css vendored
View File

@ -889,7 +889,7 @@ button .glyphicon {
background-color: #4b4b4b; background-color: #4b4b4b;
padding-bottom: 40px; padding-bottom: 40px;
padding-right: 25px; padding-right: 25px;
/*opacity:0.96 !important;*/ opacity:0.95 !important;
} }
.pro-plan-modal .left-side { .pro-plan-modal .left-side {

4
resources/views/header.blade.php
View File

@ -391,11 +391,7 @@
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li class="dropdown"> <li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">
@if (Session::get(SESSION_LOCALE) == 'en')
{{ trans('texts.history') }} <b class="caret"></b>
@else
<span class="glyphicon glyphicon-time" title="{{ trans('texts.history') }}"/> <span class="glyphicon glyphicon-time" title="{{ trans('texts.history') }}"/>
@endif
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
@if (count(Session::get(RECENTLY_VIEWED)) == 0) @if (count(Session::get(RECENTLY_VIEWED)) == 0)