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

Minor fixes

Browse Source
This commit is contained in:
Hillel Coren 2016-06-05 21:05:11 +03:00
parent 5c7a15ff83
commit 706c26b4d5
5 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -230,7 +230,7 @@ class AccountController extends BaseController
Session::flash('message', trans('texts.updated_plan')); 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)); $invitation = $this->accountRepo->enablePlan($new_plan['plan'], $new_plan['term'], $credit, !empty($pending_monthly));
return Redirect::to('view/'.$invitation->invitation_key); return Redirect::to('view/'.$invitation->invitation_key);
} }
@ -1333,12 +1333,14 @@ class AccountController extends BaseController
} }
$account = Auth::user()->account; $account = Auth::user()->account;
$invitation = $invoice->invitations->first();
// replace the variables with sample data // replace the variables with sample data
$data = [ $data = [
'account' => $account, 'account' => $account,
'invoice' => $invoice, 'invoice' => $invoice,
'invitation' => $invoice->invitations->first(), 'invitation' => $invitation,
'link' => $invitation->getLink(),
'client' => $invoice->client, 'client' => $invoice->client,
'amount' => $invoice->amount 'amount' => $invoice->amount
]; ];

7
app/Http/Controllers/AccountGatewayController.php
View File

@ -40,6 +40,13 @@ class AccountGatewayController extends BaseController
return $this->accountGatewayService->getDatatable(Auth::user()->account_id); return $this->accountGatewayService->getDatatable(Auth::user()->account_id);
} }
public function show($publicId)
{
Session::reflash();
return Redirect::to("gateways/$publicId/edit");
}
public function edit($publicId) public function edit($publicId)
{ {
$accountGateway = AccountGateway::scope($publicId)->firstOrFail(); $accountGateway = AccountGateway::scope($publicId)->firstOrFail();

4
app/Http/routes.php
View File

@ -328,7 +328,9 @@ Route::get('/forgot', function() {
Route::get('/feed', function() { Route::get('/feed', function() {
return Redirect::to(NINJA_WEB_URL.'/feed', 301); 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')) { if (!defined('CONTACT_EMAIL')) {
define('CONTACT_EMAIL', Config::get('mail.from.address')); define('CONTACT_EMAIL', Config::get('mail.from.address'));

4
resources/views/accounts/management.blade.php
View File

@ -226,6 +226,10 @@
var hash = window.location.hash; var hash = window.location.hash;
$(hash).modal('toggle'); $(hash).modal('toggle');
} }
@if (Request::input('upgrade'))
showChangePlan();
@endif
}); });
</script> </script>
@stop @stop

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

@ -423,7 +423,7 @@
@if (!Auth::user()->registered) @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() !!} &nbsp; {!! Button::success(trans('texts.sign_up'))->withAttributes(array('id' => 'signUpButton', 'data-toggle'=>'modal', 'data-target'=>'#signUpModal', 'style' => 'max-width:100px;;overflow:hidden'))->small() !!} &nbsp;
@elseif (Utils::isNinjaProd() && (!Auth::user()->isPro() || Auth::user()->isTrial())) @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() !!} &nbsp; {!! Button::success(trans('texts.plan_upgrade'))->asLinkTo(url('/settings/account_management?upgrade=true'))->withAttributes(array('style' => 'max-width:100px;overflow:hidden'))->small() !!} &nbsp;
@endif @endif
@endif @endif