mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Auto fill transaction descriptions.
This commit is contained in:
parent
e94194e28b
commit
12542d8f63
@ -10,7 +10,8 @@ use Input;
|
|||||||
use Preferences;
|
use Preferences;
|
||||||
use Response;
|
use Response;
|
||||||
use Session;
|
use Session;
|
||||||
|
use Config;
|
||||||
|
use FireflyIII\Models\TransactionType;
|
||||||
/**
|
/**
|
||||||
* Class JsonController
|
* Class JsonController
|
||||||
*
|
*
|
||||||
@ -19,7 +20,6 @@ use Session;
|
|||||||
class JsonController extends Controller
|
class JsonController extends Controller
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@ -156,16 +156,6 @@ class JsonController extends Controller
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @return \Symfony\Component\HttpFoundation\Response
|
|
||||||
*/
|
|
||||||
public function showSharedReports()
|
|
||||||
{
|
|
||||||
$pref = Preferences::get('showSharedReports', false);
|
|
||||||
|
|
||||||
return Response::json(['value' => $pref->data]);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return \Symfony\Component\HttpFoundation\Response
|
* @return \Symfony\Component\HttpFoundation\Response
|
||||||
*/
|
*/
|
||||||
@ -179,4 +169,31 @@ class JsonController extends Controller
|
|||||||
return Response::json(['value' => $new]);
|
return Response::json(['value' => $new]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return \Symfony\Component\HttpFoundation\Response
|
||||||
|
*/
|
||||||
|
public function showSharedReports()
|
||||||
|
{
|
||||||
|
$pref = Preferences::get('showSharedReports', false);
|
||||||
|
|
||||||
|
return Response::json(['value' => $pref->data]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function transactionJournals($what)
|
||||||
|
{
|
||||||
|
$descriptions = [];
|
||||||
|
$dbType = TransactionType::whereType($what)->first();
|
||||||
|
$journals = Auth::user()->transactionjournals()->where('transaction_type_id', $dbType->id)
|
||||||
|
->orderBy('id','DESC')->take(50)
|
||||||
|
->get();
|
||||||
|
foreach($journals as $j) {
|
||||||
|
$descriptions[] = $j->description;
|
||||||
|
}
|
||||||
|
|
||||||
|
$descriptions = array_unique($descriptions);
|
||||||
|
return Response::json($descriptions);
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -261,6 +261,7 @@ Route::group(
|
|||||||
Route::get('/json/categories', ['uses' => 'JsonController@categories', 'as' => 'json.categories']);
|
Route::get('/json/categories', ['uses' => 'JsonController@categories', 'as' => 'json.categories']);
|
||||||
Route::get('/json/box', ['uses' => 'JsonController@box', 'as' => 'json.box']);
|
Route::get('/json/box', ['uses' => 'JsonController@box', 'as' => 'json.box']);
|
||||||
Route::get('/json/show-shared-reports', 'JsonController@showSharedReports');
|
Route::get('/json/show-shared-reports', 'JsonController@showSharedReports');
|
||||||
|
Route::get('/json/transaction-journals/{what}', 'JsonController@transactionJournals');
|
||||||
Route::get('/json/show-shared-reports/set', 'JsonController@setSharedReports');
|
Route::get('/json/show-shared-reports/set', 'JsonController@setSharedReports');
|
||||||
|
|
||||||
|
|
||||||
|
@ -73,9 +73,9 @@ return [
|
|||||||
],
|
],
|
||||||
'accountTypeByIdentifier' =>
|
'accountTypeByIdentifier' =>
|
||||||
[
|
[
|
||||||
'asset' => 'Asset account',
|
'asset' => 'Asset account',
|
||||||
'expense' => 'Expense account',
|
'expense' => 'Expense account',
|
||||||
'revenue' => 'Revenue account',
|
'revenue' => 'Revenue account'
|
||||||
],
|
],
|
||||||
'shortNamesByFullName' =>
|
'shortNamesByFullName' =>
|
||||||
[
|
[
|
||||||
|
BIN
favicon.pxm
BIN
favicon.pxm
Binary file not shown.
@ -8,6 +8,16 @@ if ($('input[name="revenue_account"]').length > 0) {
|
|||||||
$('input[name="revenue_account"]').typeahead({source: data});
|
$('input[name="revenue_account"]').typeahead({source: data});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($('input[name="description"]').length > 0 && what != undefined) {
|
||||||
|
$.getJSON('json/transaction-journals/' + what).success(function (data) {
|
||||||
|
$('input[name="description"]').typeahead({source: data});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if ($('input[name="category"]').length > 0) {
|
if ($('input[name="category"]').length > 0) {
|
||||||
$.getJSON('json/categories').success(function (data) {
|
$.getJSON('json/categories').success(function (data) {
|
||||||
$('input[name="category"]').typeahead({source: data});
|
$('input[name="category"]').typeahead({source: data});
|
||||||
|
@ -92,6 +92,9 @@
|
|||||||
|
|
||||||
@stop
|
@stop
|
||||||
@section('scripts')
|
@section('scripts')
|
||||||
|
<script type="text/javascript">
|
||||||
|
var what = "{{$what}}";
|
||||||
|
</script>
|
||||||
<script type="text/javascript" src="js/bootstrap3-typeahead.min.js"></script>
|
<script type="text/javascript" src="js/bootstrap3-typeahead.min.js"></script>
|
||||||
<script type="text/javascript" src="js/transactions.js"></script>
|
<script type="text/javascript" src="js/transactions.js"></script>
|
||||||
@stop
|
@stop
|
||||||
|
Loading…
Reference in New Issue
Block a user