diff --git a/app/Http/Controllers/AttachmentController.php b/app/Http/Controllers/AttachmentController.php index 3befd5a886..c91da595d1 100644 --- a/app/Http/Controllers/AttachmentController.php +++ b/app/Http/Controllers/AttachmentController.php @@ -78,7 +78,7 @@ class AttachmentController extends Controller * @throws FireflyException * */ - public function download(Attachment $attachment, AttachmentHelperInterface $helper) + public function download(Attachment $attachment) { // create a disk. $disk = Storage::disk('upload'); diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index 68f27acf38..ce454fa287 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -55,7 +55,10 @@ use Watson\Validating\ValidatingTrait; * @property-read string $source_account_id * @property-read string $source_account_name * @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 whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereUpdatedAt($value) diff --git a/config/firefly.php b/config/firefly.php index 6cc857a5cd..9d82d5cea3 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -2,7 +2,7 @@ return [ 'chart' => 'chartjs', - 'version' => '3.7.2.3', + 'version' => '3.8.0', 'index_periods' => ['1D', '1W', '1M', '3M', '6M', '1Y', 'custom'], 'budget_periods' => ['daily', 'weekly', 'monthly', 'quarterly', 'half-year', 'yearly'], 'csv_import_enabled' => true,