mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Added ability to remove account logo
This commit is contained in:
parent
88b8d97603
commit
1757dd706d
@ -529,7 +529,7 @@ class AccountController extends \BaseController {
|
|||||||
if ($file = Input::file('logo'))
|
if ($file = Input::file('logo'))
|
||||||
{
|
{
|
||||||
$path = Input::file('logo')->getRealPath();
|
$path = Input::file('logo')->getRealPath();
|
||||||
File::delete('logo/' . $account->account_key . '.jpg');
|
File::delete('logo/' . $account->account_key . '.jpg');
|
||||||
Image::make($path)->resize(120, 80, true, false)->save('logo/' . $account->account_key . '.jpg');
|
Image::make($path)->resize(120, 80, true, false)->save('logo/' . $account->account_key . '.jpg');
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -540,6 +540,14 @@ class AccountController extends \BaseController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function removeLogo() {
|
||||||
|
|
||||||
|
File::delete('logo/' . Auth::user()->account->account_key . '.jpg');
|
||||||
|
|
||||||
|
Session::flash('message', 'Successfully removed logo');
|
||||||
|
return Redirect::to('company/details');
|
||||||
|
}
|
||||||
|
|
||||||
public function checkEmail()
|
public function checkEmail()
|
||||||
{
|
{
|
||||||
$email = User::withTrashed()->where('email', '=', Input::get('email'))->where('id', '<>', Auth::user()->id)->first();
|
$email = User::withTrashed()->where('email', '=', Input::get('email'))->where('id', '<>', Auth::user()->id)->first();
|
||||||
|
@ -92,6 +92,7 @@ Route::group(array('before' => 'auth'), function()
|
|||||||
Route::get('company/{section?}', 'AccountController@showSection');
|
Route::get('company/{section?}', 'AccountController@showSection');
|
||||||
Route::post('company/{section?}', 'AccountController@doSection');
|
Route::post('company/{section?}', 'AccountController@doSection');
|
||||||
Route::post('user/setTheme', 'UserController@setTheme');
|
Route::post('user/setTheme', 'UserController@setTheme');
|
||||||
|
Route::post('remove_logo', 'AccountController@removeLogo');
|
||||||
|
|
||||||
Route::resource('clients', 'ClientController');
|
Route::resource('clients', 'ClientController');
|
||||||
Route::get('api/clients', array('as'=>'api.clients', 'uses'=>'ClientController@getDatatable'));
|
Route::get('api/clients', array('as'=>'api.clients', 'uses'=>'ClientController@getDatatable'));
|
||||||
|
@ -33,7 +33,8 @@
|
|||||||
|
|
||||||
@if (file_exists($account->getLogoPath()))
|
@if (file_exists($account->getLogoPath()))
|
||||||
<center>
|
<center>
|
||||||
{{ HTML::image($account->getLogoPath(), "Logo") }}
|
{{ HTML::image($account->getLogoPath(), "Logo") }}
|
||||||
|
<a href="#" onclick="deleteLogo()">Remove logo</a>
|
||||||
</center><br/>
|
</center><br/>
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
@ -82,12 +83,22 @@
|
|||||||
|
|
||||||
{{ Former::close() }}
|
{{ Former::close() }}
|
||||||
|
|
||||||
|
{{ Form::open(['url' => 'remove_logo', 'class' => 'removeLogoForm']) }}
|
||||||
|
{{ Form::close() }}
|
||||||
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|
||||||
$(function() {
|
$(function() {
|
||||||
$('#country_id').combobox();
|
$('#country_id').combobox();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
function deleteLogo() {
|
||||||
|
if (confirm('Are you sure?')) {
|
||||||
|
$('.removeLogoForm').submit();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
@stop
|
@stop
|
@ -18,8 +18,8 @@
|
|||||||
<script src="{{ asset('vendor/accounting/accounting.min.js') }}" type="text/javascript"></script>
|
<script src="{{ asset('vendor/accounting/accounting.min.js') }}" type="text/javascript"></script>
|
||||||
<script src="{{ asset('js/bootstrap-combobox.js') }}" type="text/javascript"></script>
|
<script src="{{ asset('js/bootstrap-combobox.js') }}" type="text/javascript"></script>
|
||||||
<script src="{{ asset('js/jspdf.source.js') }}" type="text/javascript"></script>
|
<script src="{{ asset('js/jspdf.source.js') }}" type="text/javascript"></script>
|
||||||
<script src="{{ asset('js/jspdf.plugin.split_text_to_size.js') }}" type="text/javascript"></script>
|
<script src="{{ asset('js/jspdf.plugin.split_text_to_size.js') }}" type="text/javascript"></script>
|
||||||
<script src="{{ asset('js/script.js') }}" type="text/javascript"></script>
|
<script src="{{ asset('js/script.js') }}" type="text/javascript"></script>
|
||||||
|
|
||||||
<link href="{{ asset('vendor/bootstrap/dist/css/bootstrap.min.css') }}" rel="stylesheet" type="text/css"/>
|
<link href="{{ asset('vendor/bootstrap/dist/css/bootstrap.min.css') }}" rel="stylesheet" type="text/css"/>
|
||||||
<link href="{{ asset('vendor/datatables/media/css/jquery.dataTables.css') }}" rel="stylesheet" type="text/css">
|
<link href="{{ asset('vendor/datatables/media/css/jquery.dataTables.css') }}" rel="stylesheet" type="text/css">
|
||||||
|
280
public/js/jspdf.min.js
vendored
280
public/js/jspdf.min.js
vendored
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user