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

Enabled re-sending confirmation email

Browse Source
This commit is contained in:
Hillel Coren 2015-04-13 15:49:40 +03:00
parent 5a6197fbb4
commit 3641019d04
7 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -739,4 +739,12 @@ class AccountController extends BaseController
return Redirect::to('/')->with('clearGuestKey', true);
}
public function resendConfirmation()
{
$user = Auth::user();
$this->userMailer->sendConfirmation($user);
return Redirect::to('/company/details')->with('message', trans('texts.confirmation_resent'));
}
}

3
app/Http/routes.php
View File

@ -71,7 +71,7 @@ get('/forgot', array('as' => 'forgot', 'uses' => 'Auth\PasswordController@getEma
post('/forgot', array('as' => 'forgot', 'uses' => 'Auth\PasswordController@postEmail'));
get('/password/reset', array('as' => 'forgot', 'uses' => 'Auth\PasswordController@getReset'));
post('/password/reset', array('as' => 'forgot', 'uses' => 'Auth\PasswordController@postReset'));
get('user/confirm/{code}', 'UserController@confirm');
get('/user/confirm/{code}', 'UserController@confirm');
/*
// Confide routes
@ -167,6 +167,7 @@ Route::group(['middleware' => 'auth'], function() {
Route::get('api/credits/{client_id?}', array('as'=>'api.credits', 'uses'=>'CreditController@getDatatable'));
Route::post('credits/bulk', 'CreditController@bulk');
get('/resend_confirmation', 'AccountController@resendConfirmation');
//Route::resource('timesheets', 'TimesheetController');
});

3
resources/lang/en/texts.php
View File

@ -582,5 +582,8 @@ return array(
'email_approved' => 'Email me when a quote is <b>approved</b>',
'notification_quote_approved_subject' => 'Quote :invoice was approved by :client',
'notification_quote_approved' => 'The following client :client approved Quote :invoice for :amount.',
'resend_confirmation' => 'Resend confirmation email',
'confirmation_resent' => 'The confirmation email was resent',
);

2
resources/views/accounts/details.blade.php
View File

@ -66,6 +66,8 @@
{!! Former::text('phone') !!}
@if (Auth::user()->confirmed)
{!! Former::actions( Button::primary(trans('texts.change_password'))->small()->withAttributes(['onclick'=>'showChangePassword()'])) !!}
@elseif (Auth::user()->registered)
{!! Former::actions( Button::primary(trans('texts.resend_confirmation'))->asLinkTo('/resend_confirmation')->small() ) !!}
@endif
@endif

6
resources/views/accounts/notifications.blade.php
View File

@ -39,8 +39,10 @@
</div></div>
{!! Former::legend(trans('texts.custom_messages')) !!}
{!! Former::textarea('invoice_terms')->label(trans('texts.default_invoice_terms')) !!}
{!! Former::textarea('invoice_footer')->label(trans('texts.default_invoice_footer')) !!}
{!! Former::textarea('invoice_terms')->label(trans('texts.default_invoice_terms'))
->onchange("$('#invoice_terms').val(wordWrapText($('#invoice_terms').val(), 300))") !!}
{!! Former::textarea('invoice_footer')->label(trans('texts.default_invoice_footer'))
->onchange("$('#invoice_footer').val(wordWrapText($('#invoice_footer').val(), 600))") !!}
{!! Former::textarea('email_footer')->label(trans('texts.default_email_footer')) !!}
{!! Former::actions(

2
resources/views/invoices/edit.blade.php
View File

@ -685,7 +685,7 @@
invoice.imageHeight = {{ $account->getLogoHeight() }};
@endif
return invoice;
return invoice;
}
function getPDFString() {