diff --git a/app/Events/JournalDeleted.php b/app/Events/JournalDeleted.php deleted file mode 100644 index 575697e6f9..0000000000 --- a/app/Events/JournalDeleted.php +++ /dev/null @@ -1,25 +0,0 @@ - $data['user'], - 'transaction_type_id' => $transactionType->id, - 'amount_currency_id_amount' => $data['amount_currency_id_amount'], - 'description' => $data['description'], - 'completed' => 0, - 'date' => $data['date'], + 'user_id' => $data['user'], + 'transaction_type_id' => $transactionType->id, + 'transaction_currency_id' => $data['amount_currency_id_amount'], + 'description' => $data['description'], + 'completed' => 0, + 'date' => $data['date'], ] ); $journal->save(); diff --git a/composer.json b/composer.json index 3e12f62800..a7c91bf9ee 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,6 @@ "require": { "laravel/framework": "5.1.*", "davejamesmiller/laravel-breadcrumbs": "~3.0", - "grumpydictator/gchart": "~1", "watson/validating": "~1.0", "doctrine/dbal": "~2.5", "illuminate/html": "~5.0", diff --git a/config/firefly.php b/config/firefly.php index 2ebd6019aa..a7696da971 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -2,7 +2,7 @@ return [ 'chart' => 'chartjs', - 'version' => '3.5.6', + 'version' => '3.5.6.1', 'index_periods' => ['1D', '1W', '1M', '3M', '6M', '1Y', 'custom'], 'budget_periods' => ['daily', 'weekly', 'monthly', 'quarterly', 'half-year', 'yearly'], 'csv_import_enabled' => true,