IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-27 17:31:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Small bug fixes.

Browse Source
This commit is contained in:
James Cole 2016-03-14 20:47:13 +01:00
parent be58da539e
commit 631bafc6ab
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/AttachmentController.php
View File

@ -78,7 +78,7 @@ class AttachmentController extends Controller
* @throws FireflyException * @throws FireflyException
* *
*/ */
public function download(Attachment $attachment, AttachmentHelperInterface $helper) public function download(Attachment $attachment)
{ {
// create a disk. // create a disk.
$disk = Storage::disk('upload'); $disk = Storage::disk('upload');

5
app/Models/TransactionJournal.php
View File

@ -55,7 +55,10 @@ use Watson\Validating\ValidatingTrait;
* @property-read string $source_account_id * @property-read string $source_account_id
* @property-read string $source_account_name * @property-read string $source_account_name
* @property-read string $source_account_type * @property-read string $source_account_type
* @property string $process_date * @property \Carbon\Carbon $process_date
* @property int $account_id
* @property float $journalAmount
* @property string $account_name
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereCreatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereUpdatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereUpdatedAt($value)

2
config/firefly.php
View File

@ -2,7 +2,7 @@
return [ return [
'chart' => 'chartjs', 'chart' => 'chartjs',
'version' => '3.7.2.3', 'version' => '3.8.0',
'index_periods' => ['1D', '1W', '1M', '3M', '6M', '1Y', 'custom'], 'index_periods' => ['1D', '1W', '1M', '3M', '6M', '1Y', 'custom'],
'budget_periods' => ['daily', 'weekly', 'monthly', 'quarterly', 'half-year', 'yearly'], 'budget_periods' => ['daily', 'weekly', 'monthly', 'quarterly', 'half-year', 'yearly'],
'csv_import_enabled' => true, 'csv_import_enabled' => true,