diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 4fa6e1b90126..72f56e14ee3c 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -230,7 +230,7 @@ class AccountController extends BaseController Session::flash('message', trans('texts.updated_plan')); } - if (!empty($new_plan)) { + if (!empty($new_plan) && $new_plan['plan'] != PLAN_FREE) { $invitation = $this->accountRepo->enablePlan($new_plan['plan'], $new_plan['term'], $credit, !empty($pending_monthly)); return Redirect::to('view/'.$invitation->invitation_key); } @@ -1333,12 +1333,14 @@ class AccountController extends BaseController } $account = Auth::user()->account; + $invitation = $invoice->invitations->first(); // replace the variables with sample data $data = [ 'account' => $account, 'invoice' => $invoice, - 'invitation' => $invoice->invitations->first(), + 'invitation' => $invitation, + 'link' => $invitation->getLink(), 'client' => $invoice->client, 'amount' => $invoice->amount ]; diff --git a/app/Http/Controllers/AccountGatewayController.php b/app/Http/Controllers/AccountGatewayController.php index 629932c567e8..38d4e7f65c9d 100644 --- a/app/Http/Controllers/AccountGatewayController.php +++ b/app/Http/Controllers/AccountGatewayController.php @@ -40,6 +40,13 @@ class AccountGatewayController extends BaseController return $this->accountGatewayService->getDatatable(Auth::user()->account_id); } + public function show($publicId) + { + Session::reflash(); + + return Redirect::to("gateways/$publicId/edit"); + } + public function edit($publicId) { $accountGateway = AccountGateway::scope($publicId)->firstOrFail(); diff --git a/app/Http/routes.php b/app/Http/routes.php index c42049ff369b..9efd8c77ad43 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -328,7 +328,9 @@ Route::get('/forgot', function() { Route::get('/feed', function() { return Redirect::to(NINJA_WEB_URL.'/feed', 301); }); - +Route::get('/comments/feed', function() { + return Redirect::to(NINJA_WEB_URL.'/comments/feed', 301); +}); if (!defined('CONTACT_EMAIL')) { define('CONTACT_EMAIL', Config::get('mail.from.address')); diff --git a/resources/views/accounts/management.blade.php b/resources/views/accounts/management.blade.php index ac57cf737dd6..a493028591ca 100644 --- a/resources/views/accounts/management.blade.php +++ b/resources/views/accounts/management.blade.php @@ -1,6 +1,6 @@ @extends('header') -@section('content') +@section('content') @parent @include('accounts.nav', ['selected' => ACCOUNT_MANAGEMENT]) @@ -134,10 +134,10 @@ @@ -165,12 +165,12 @@
 

{{ trans('texts.cancel_account_message') }}

  -  

{!! Former::textarea('reason')->placeholder(trans('texts.reason_for_canceling'))->raw() !!}

  +  

{!! Former::textarea('reason')->placeholder(trans('texts.reason_for_canceling'))->raw() !!}

 
@@ -182,7 +182,7 @@ -@stop \ No newline at end of file +@stop diff --git a/resources/views/header.blade.php b/resources/views/header.blade.php index b8fdccf9bd31..3fe91386b251 100644 --- a/resources/views/header.blade.php +++ b/resources/views/header.blade.php @@ -423,7 +423,7 @@ @if (!Auth::user()->registered) {!! Button::success(trans('texts.sign_up'))->withAttributes(array('id' => 'signUpButton', 'data-toggle'=>'modal', 'data-target'=>'#signUpModal', 'style' => 'max-width:100px;;overflow:hidden'))->small() !!}   @elseif (Utils::isNinjaProd() && (!Auth::user()->isPro() || Auth::user()->isTrial())) - {!! Button::success(trans('texts.go_pro'))->withAttributes(array('id' => 'proPlanButton', 'onclick' => 'showProPlan("")', 'style' => 'max-width:100px;overflow:hidden'))->small() !!}   + {!! Button::success(trans('texts.plan_upgrade'))->asLinkTo(url('/settings/account_management?upgrade=true'))->withAttributes(array('style' => 'max-width:100px;overflow:hidden'))->small() !!}   @endif @endif