Merge branch 'release/3.5.1'

app/Generator/Chart/Account/ChartJsAccountChartGenerator.php

@@ -41,34 +41,24 @@ class ChartJsAccountChartGenerator implements AccountChartGenerator
      */
     public function expenseAccounts(Collection $accounts, Carbon $start, Carbon $end)
     {
-        // language:
-
         $data = [
             'count'    => 1,
-            'labels'   => [],
-            'datasets' => [
-                [
+            'labels'   => [], 'datasets' => [[
                                'label' => trans('firefly.spent'),
-                    'data'  => []
-                ]
-            ],
-        ];
-        $ids  = [];
+                               'data'  => []]]];
 
-        foreach ($accounts as $account) {
-            $ids[] = $account->id;
-        }
+        bcscale(2);
         $start->subDay();
-
+        $ids           = $this->getIdsFromCollection($accounts);
         $startBalances = Steam::balancesById($ids, $start);
         $endBalances   = Steam::balancesById($ids, $end);
 
         $accounts->each(
             function (Account $account) use ($startBalances, $endBalances) {
                 $id                  = $account->id;
-                $startBalance        = isset($startBalances[$id]) ? $startBalances[$id] : 0;
-                $endBalance          = isset($endBalances[$id]) ? $endBalances[$id] : 0;
-                $diff                = $endBalance - $startBalance;
+                $startBalance        = $this->isInArray($startBalances, $id);
+                $endBalance          = $this->isInArray($endBalances, $id);
+                $diff                = bcsub($endBalance, $startBalance);
                 $account->difference = round($diff, 2);
             }
         );
@@ -86,10 +76,24 @@ class ChartJsAccountChartGenerator implements AccountChartGenerator
             }
         }
 
-
         return $data;
     }
 
+    /**
+     * @param $array
+     * @param $entryId
+     *
+     * @return string
+     */
+    protected function isInArray($array, $entryId)
+    {
+        if (isset($array[$entryId])) {
+            return $array[$entryId];
+        }
+
+        return '0';
+    }
+
 
     /**
      * @param Collection $accounts
@@ -171,4 +175,20 @@ class ChartJsAccountChartGenerator implements AccountChartGenerator
 
         return $data;
     }
+
+    /**
+     * @param Collection $collection
+     *
+     * @return array
+     */
+    protected function getIdsFromCollection(Collection $collection)
+    {
+        $ids = [];
+        foreach ($collection as $entry) {
+            $ids[] = $entry->id;
+        }
+
+        return array_unique($ids);
+
+    }
 }

app/Http/Controllers/CronController.php

@@ -25,7 +25,16 @@ class CronController extends Controller
 
         if (strlen(env('SENDGRID_USERNAME')) > 0 && strlen(env('SENDGRID_PASSWORD')) > 0) {
 
-            $URL        = 'https://api.sendgrid.com/api/bounces.get.json';
+            $set = [
+                'blocks'   => 'https://api.sendgrid.com/api/blocks.get.json',
+                'bounces'  => 'https://api.sendgrid.com/api/bounces.get.json',
+                'invalids' => 'https://api.sendgrid.com/api/invalidemails.get.json',
+
+            ];
+            echo '<pre>';
+            foreach ($set as $name => $URL) {
+
+
                 $parameters = [
                     'api_user' => env('SENDGRID_USERNAME'),
                     'api_key'  => env('SENDGRID_PASSWORD'),
@@ -39,7 +48,7 @@ class CronController extends Controller
                  * Loop the result, if any.
                  */
                 if (is_array($data)) {
-                echo 'Found ' . count($data) . ' entries in the SendGrid bounce list.' . "\n";
+                    echo 'Found ' . count($data) . ' entries in the SendGrid ' . $name . ' list.' . "\n";
                     foreach ($data as $entry) {
                         $address = $entry->email;
                         $user    = User::where('email', $address)->where('blocked', 0)->first();
@@ -54,6 +63,7 @@ class CronController extends Controller
                         }
                     }
                 }
+            }
             echo 'Done!' . "\n";
         } else {
             echo 'Please fill in SendGrid details.';

app/Http/Controllers/TagController.php

@@ -44,9 +44,9 @@ class TagController extends Controller
         View::share('mainTitleIcon', 'fa-tags');
         View::share('hideTags', true);
         $this->tagOptions = [
-            'nothing'        => 'Just a regular tag.',
-            'balancingAct'   => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.',
-            'advancePayment' => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.',
+            'nothing'        => trans('firefly.regular_tag'),
+            'balancingAct'   => trans('firefly.balancing_act'),
+            'advancePayment' => trans('firefly.advance_payment'),
         ];
         View::share('tagOptions', $this->tagOptions);
     }

app/Http/Controllers/TransactionController.php

@@ -136,6 +136,12 @@ class TransactionController extends Controller
      */
     public function edit(AccountRepositoryInterface $repository, TransactionJournal $journal)
     {
+        // cannot edit opening balance
+        if ($journal->transactionType->type == 'Opening balance') {
+            return view('error')->with('message', 'Cannot edit this transaction. Edit the account instead!');
+        }
+
+
         $maxFileSize = Steam::phpBytes(ini_get('upload_max_filesize'));
         $maxPostSize = Steam::phpBytes(ini_get('post_max_size'));
         $uploadSize  = min($maxFileSize, $maxPostSize);
@@ -333,6 +339,11 @@ class TransactionController extends Controller
     public function update(JournalFormRequest $request, JournalRepositoryInterface $repository, AttachmentHelperInterface $att, TransactionJournal $journal)
     {
 
+        // cannot edit opening balance
+        if ($journal->transactionType->type == 'Opening balance') {
+            return view('error')->with('message', 'Cannot edit this transaction. Edit the account instead!');
+        }
+
         $journalData = $request->getJournalData();
         $repository->update($journal, $journalData);
 

app/Http/breadcrumbs.php

@@ -42,7 +42,7 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'accounts.create', function (Generator $breadcrumbs, $what) {
     $breadcrumbs->parent('accounts.index', $what);
-    $breadcrumbs->push(trans('breadcrumbs.new_' . strtolower(e($what)) . '_account'), route('accounts.create', [$what]));
+    $breadcrumbs->push(trans('firefly.new_' . strtolower(e($what)) . '_account'), route('accounts.create', [$what]));
 }
 );
 
@@ -129,7 +129,7 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'categories.create', function (Generator $breadcrumbs) {
     $breadcrumbs->parent('categories.index');
-    $breadcrumbs->push(trans('breadcrumbs.newCategory'), route('categories.create'));
+    $breadcrumbs->push(trans('firefly.new_category'), route('categories.create'));
 }
 );
 
@@ -231,7 +231,7 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'piggy-banks.index', function (Generator $breadcrumbs) {
     $breadcrumbs->parent('home');
-    $breadcrumbs->push(trans('breadcrumbs.piggyBanks'), route('piggy-banks.index'));
+    $breadcrumbs->push(trans('firefly.piggyBanks'), route('piggy-banks.index'));
 }
 );
 Breadcrumbs::register(
@@ -250,7 +250,7 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'piggy-banks.delete', function (Generator $breadcrumbs, PiggyBank $piggyBank) {
     $breadcrumbs->parent('piggy-banks.show', $piggyBank);
-    $breadcrumbs->push(trans('breadcrumbs.delete_piggyBank', ['name' => e($piggyBank->name)]), route('piggy-banks.delete', [$piggyBank->id]));
+    $breadcrumbs->push(trans('firefly.delete_piggy_bank', ['name' => e($piggyBank->name)]), route('piggy-banks.delete', [$piggyBank->id]));
 }
 );
 

app/Repositories/Account/AccountRepository.php

@@ -375,6 +375,7 @@ class AccountRepository implements AccountRepositoryInterface
         return TransactionJournal
             ::orderBy('transaction_journals.date', 'ASC')
             ->accountIs($account)
+            ->transactionTypes(['Opening balance'])
             ->orderBy('created_at', 'ASC')
             ->first(['transaction_journals.*']);
     }
@@ -394,10 +395,9 @@ class AccountRepository implements AccountRepositoryInterface
 
         // continue with the opposing account:
         if ($data['openingBalance'] != 0) {
-            $type         = $data['openingBalance'] < 0 ? 'expense' : 'revenue';
             $opposingData = [
                 'user'           => $data['user'],
-                'accountType'    => $type,
+                'accountType'    => 'initial',
                 'virtualBalance' => 0,
                 'name'           => $data['name'] . ' initial balance',
                 'active'         => false,

app/Repositories/Category/CategoryRepository.php

@@ -78,15 +78,15 @@ class CategoryRepository extends ComponentRepository implements CategoryReposito
                    ->transactionTypes(['Withdrawal'])
                    ->get(['categories.id as category_id', 'categories.encrypted as category_encrypted', 'categories.name', 'transaction_journals.*']);
 
+        bcscale(2);
         $result = [];
         foreach ($set as $entry) {
             $categoryId = intval($entry->category_id);
             if (isset($result[$categoryId])) {
-                bcscale(2);
                 $result[$categoryId]['sum'] = bcadd($result[$categoryId]['sum'], $entry->amount);
             } else {
-                $isEncrypted         = intval($entry->category_encrypted) == 1 ? true : false;
-                $name                = strlen($entry->name) == 0 ? trans('firefly.no_category') : $entry->name;
+                $isEncrypted         = intval($entry->category_encrypted) === 1 ? true : false;
+                $name                = strlen($entry->name) === 0 ? trans('firefly.no_category') : $entry->name;
                 $name                = $isEncrypted ? Crypt::decrypt($name) : $name;
                 $result[$categoryId] = [
                     'name' => $name,

app/Validation/FireflyValidator.php

@@ -62,21 +62,11 @@ class FireflyValidator extends Validator
      */
     public function validateIban($attribute, $value)
     {
-        if (!is_string($value)) {
-            return false;
-        }
-        if (is_null($value)) {
-            return false;
-        }
-
-        if (strlen($value) === 0) {
+        if (!is_string($value) || is_null($value) || strlen($value) < 6) {
             return false;
         }
 
         $value = strtoupper($value);
-        if (strlen($value) < 6) {
-            return false;
-        }
 
         $search  = [' ', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'];
         $replace = ['', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31',

composer.json

@@ -29,9 +29,7 @@
         "league/commonmark": "0.7.*",
         "rcrowe/twigbridge": "0.7.x@dev",
         "zizaco/entrust": "dev-laravel-5",
-        "codeception/codeception": "*",
-        "league/csv": "^7.1",
-        "nesbot/carbon": "^1.20"
+        "league/csv": "^7.1"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "@stable",

config/firefly.php

@@ -2,7 +2,7 @@
 
 return [
     'chart'                    => 'chartjs',
-    'version'                  => '3.5.0',
+    'version'                  => '3.5.1',
     'index_periods'            => ['1D', '1W', '1M', '3M', '6M', '1Y', 'custom'],
     'budget_periods'           => ['daily', 'weekly', 'monthly', 'quarterly', 'half-year', 'yearly'],
     'csv_import_enabled'       => true,
@@ -85,7 +85,9 @@ return [
         [
             'asset'   => 'Asset account',
             'expense' => 'Expense account',
-            'revenue' => 'Revenue account'
+            'revenue' => 'Revenue account',
+            'opening' => 'Initial balance account',
+            'initial' => 'Initial balance account',
         ],
     'shortNamesByFullName'     =>
         [

public/css/daterangepicker-bs3.css

@@ -1,335 +0,0 @@
-/*!
- * Stylesheet for the Date Range Picker, for use with Bootstrap 3.x
- *
- * Copyright 2013-2015 Dan Grossman ( http://www.dangrossman.info )
- * Licensed under the MIT license. See http://www.opensource.org/licenses/mit-license.php
- *
- * Built for http://www.improvely.com
- */
-
-.daterangepicker.dropdown-menu {
-    max-width: none;
-    z-index: 3000;
-}
-
-.daterangepicker.opensleft .ranges, .daterangepicker.opensleft .calendar {
-    float: left;
-    margin: 4px;
-}
-
-.daterangepicker.opensright .ranges, .daterangepicker.opensright .calendar,
-.daterangepicker.openscenter .ranges, .daterangepicker.openscenter .calendar {
-    float: right;
-    margin: 4px;
-}
-
-.daterangepicker.single .ranges, .daterangepicker.single .calendar {
-    float: none;
-}
-
-.daterangepicker .ranges {
-    width: 160px;
-    text-align: left;
-}
-
-.daterangepicker .ranges .range_inputs>div {
-    float: left;
-}
-
-.daterangepicker .ranges .range_inputs>div:nth-child(2) {
-    padding-left: 11px;
-}
-
-.daterangepicker .calendar {
-    display: none;
-    max-width: 270px;
-}
-
-.daterangepicker.show-calendar .calendar {
-    display: block;
-}
-
-.daterangepicker .calendar.single .calendar-date {
-    border: none;
-}
-
-.daterangepicker .calendar th, .daterangepicker .calendar td {
-    font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
-    white-space: nowrap;
-    text-align: center;
-    min-width: 32px;
-}
-
-.daterangepicker .daterangepicker_start_input label,
-.daterangepicker .daterangepicker_end_input label {
-    color: #333;
-    display: block;
-    font-size: 11px;
-    font-weight: normal;
-    height: 20px;
-    line-height: 20px;
-    margin-bottom: 2px;
-    text-shadow: #fff 1px 1px 0px;
-    text-transform: uppercase;
-    width: 74px;
-}
-
-.daterangepicker .ranges input {
-    font-size: 11px;
-}
-
-.daterangepicker .ranges .input-mini {
-    border: 1px solid #ccc;
-    border-radius: 4px;
-    color: #555;
-    display: block;
-    font-size: 11px;
-    height: 30px;
-    line-height: 30px;
-    vertical-align: middle;
-    margin: 0 0 10px 0;
-    padding: 0 6px;
-    width: 74px;
-}
-
-.daterangepicker .ranges ul {
-    list-style: none;
-    margin: 0;
-    padding: 0;
-}
-
-.daterangepicker .ranges li {
-    font-size: 13px;
-    background: #f5f5f5;
-    border: 1px solid #f5f5f5;
-    color: #08c;
-    padding: 3px 12px;
-    margin-bottom: 8px;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-    cursor: pointer;
-}
-
-.daterangepicker .ranges li.active, .daterangepicker .ranges li:hover {
-    background: #08c;
-    border: 1px solid #08c;
-    color: #fff;
-}
-
-.daterangepicker .calendar-date {
-    border: 1px solid #ddd;
-    padding: 4px;
-    border-radius: 4px;
-    background: #fff;
-}
-
-.daterangepicker .calendar-time {
-    text-align: center;
-    margin: 8px auto 0 auto;
-    line-height: 30px;
-}
-
-.daterangepicker {
-    position: absolute;
-    background: #fff;
-    top: 100px;
-    left: 20px;
-    padding: 4px;
-    margin-top: 1px;
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-}
-
-.daterangepicker.opensleft:before {
-    position: absolute;
-    top: -7px;
-    right: 9px;
-    display: inline-block;
-    border-right: 7px solid transparent;
-    border-bottom: 7px solid #ccc;
-    border-left: 7px solid transparent;
-    border-bottom-color: rgba(0, 0, 0, 0.2);
-    content: '';
-}
-
-.daterangepicker.opensleft:after {
-    position: absolute;
-    top: -6px;
-    right: 10px;
-    display: inline-block;
-    border-right: 6px solid transparent;
-    border-bottom: 6px solid #fff;
-    border-left: 6px solid transparent;
-    content: '';
-}
-
-.daterangepicker.openscenter:before {
-    position: absolute;
-    top: -7px;
-    left: 0;
-    right: 0;
-    width: 0;
-    margin-left: auto;
-    margin-right: auto;
-    display: inline-block;
-    border-right: 7px solid transparent;
-    border-bottom: 7px solid #ccc;
-    border-left: 7px solid transparent;
-    border-bottom-color: rgba(0, 0, 0, 0.2);
-    content: '';
-}
-
-.daterangepicker.openscenter:after {
-    position: absolute;
-    top: -6px;
-    left: 0;
-    right: 0;
-    width: 0;
-    margin-left: auto;
-    margin-right: auto;
-    display: inline-block;
-    border-right: 6px solid transparent;
-    border-bottom: 6px solid #fff;
-    border-left: 6px solid transparent;
-    content: '';
-}
-
-.daterangepicker.opensright:before {
-    position: absolute;
-    top: -7px;
-    left: 9px;
-    display: inline-block;
-    border-right: 7px solid transparent;
-    border-bottom: 7px solid #ccc;
-    border-left: 7px solid transparent;
-    border-bottom-color: rgba(0, 0, 0, 0.2);
-    content: '';
-}
-
-.daterangepicker.opensright:after {
-    position: absolute;
-    top: -6px;
-    left: 10px;
-    display: inline-block;
-    border-right: 6px solid transparent;
-    border-bottom: 6px solid #fff;
-    border-left: 6px solid transparent;
-    content: '';
-}
-
-.daterangepicker.dropup{
-    margin-top: -5px;
-}
-.daterangepicker.dropup:before{
-    top: initial;
-    bottom:-7px;
-    border-bottom: initial;
-    border-top: 7px solid #ccc;
-}
-.daterangepicker.dropup:after{
-    top: initial;
-    bottom:-6px;
-    border-bottom: initial;
-    border-top: 6px solid #fff;
-}
-
-.daterangepicker table {
-    width: 100%;
-    margin: 0;
-}
-
-.daterangepicker td, .daterangepicker th {
-    text-align: center;
-    width: 20px;
-    height: 20px;
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-    cursor: pointer;
-    white-space: nowrap;
-}
-
-.daterangepicker td.off {
-    color: #999;
-}
-
-.daterangepicker td.disabled, .daterangepicker option.disabled {
-    color: #999;
-}
-
-.daterangepicker td.available:hover, .daterangepicker th.available:hover {
-    background: #eee;
-}
-
-.daterangepicker td.in-range {
-    background: #ebf4f8;
-    -webkit-border-radius: 0;
-    -moz-border-radius: 0;
-    border-radius: 0;
-}
-
-.daterangepicker td.start-date {
-    -webkit-border-radius: 4px 0 0 4px;
-    -moz-border-radius: 4px 0 0 4px;
-    border-radius: 4px 0 0 4px;
-}
-
-.daterangepicker td.end-date {
-    -webkit-border-radius: 0 4px 4px 0;
-    -moz-border-radius: 0 4px 4px 0;
-    border-radius: 0 4px 4px 0;
-}
-
-.daterangepicker td.start-date.end-date {
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-}
-
-.daterangepicker td.active, .daterangepicker td.active:hover {
-    background-color: #357ebd;
-    border-color: #3071a9;
-    color: #fff;
-}
-
-.daterangepicker td.week, .daterangepicker th.week {
-    font-size: 80%;
-    color: #ccc;
-}
-
-.daterangepicker select.monthselect, .daterangepicker select.yearselect {
-    font-size: 12px;
-    padding: 1px;
-    height: auto;
-    margin: 0;
-    cursor: default;
-}
-
-.daterangepicker select.monthselect {
-    margin-right: 2%;
-    width: 56%;
-}
-
-.daterangepicker select.yearselect {
-    width: 40%;
-}
-
-.daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.secondselect, .daterangepicker select.ampmselect {
-    width: 50px;
-    margin-bottom: 0;
-}
-
-.daterangepicker_start_input {
-    float: left;
-}
-
-.daterangepicker_end_input {
-    float: left;
-    padding-left: 11px
-}
-
-.daterangepicker th.month {
-    width: auto;
-}

public/css/daterangepicker.css

@@ -0,0 +1,341 @@
+/**
+* A stylesheet for use with Bootstrap 3.x
+* @author: Dan Grossman http://www.dangrossman.info/
+* @copyright: Copyright (c) 2012-2015 Dan Grossman. All rights reserved.
+* @license: Licensed under the MIT license. See http://www.opensource.org/licenses/mit-license.php
+* @website: https://www.improvely.com/
+*/
+
+/* Container Appearance */
+
+.daterangepicker {
+  position: absolute;
+  background: #fff;
+  top: 100px;
+  left: 20px;
+  padding: 4px;
+  margin-top: 1px;
+  border-radius: 4px;
+}
+
+.daterangepicker.opensleft:before {
+  position: absolute;
+  top: -7px;
+  right: 9px;
+  display: inline-block;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-left: 7px solid transparent;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  content: '';
+}
+
+.daterangepicker.opensleft:after {
+  position: absolute;
+  top: -6px;
+  right: 10px;
+  display: inline-block;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #fff;
+  border-left: 6px solid transparent;
+  content: '';
+}
+
+.daterangepicker.openscenter:before {
+  position: absolute;
+  top: -7px;
+  left: 0;
+  right: 0;
+  width: 0;
+  margin-left: auto;
+  margin-right: auto;
+  display: inline-block;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-left: 7px solid transparent;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  content: '';
+}
+
+.daterangepicker.openscenter:after {
+  position: absolute;
+  top: -6px;
+  left: 0;
+  right: 0;
+  width: 0;
+  margin-left: auto;
+  margin-right: auto;
+  display: inline-block;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #fff;
+  border-left: 6px solid transparent;
+  content: '';
+}
+
+.daterangepicker.opensright:before {
+  position: absolute;
+  top: -7px;
+  left: 9px;
+  display: inline-block;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-left: 7px solid transparent;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  content: '';
+}
+
+.daterangepicker.opensright:after {
+  position: absolute;
+  top: -6px;
+  left: 10px;
+  display: inline-block;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #fff;
+  border-left: 6px solid transparent;
+  content: '';
+}
+
+.daterangepicker.dropup{
+  margin-top: -5px;
+}
+.daterangepicker.dropup:before{
+  top: initial;
+  bottom:-7px;
+  border-bottom: initial;
+  border-top: 7px solid #ccc;
+}
+.daterangepicker.dropup:after{
+  top: initial;
+  bottom:-6px;
+  border-bottom: initial;
+  border-top: 6px solid #fff;
+}
+
+.daterangepicker.dropdown-menu {
+  max-width: none;
+  z-index: 3000;
+}
+
+.daterangepicker .ranges, .daterangepicker .calendar {
+  float: left;
+}
+
+.daterangepicker.single .ranges, .daterangepicker.single .calendar {
+  float: none;
+}
+
+.daterangepicker .ranges {
+  margin: 4px;
+  text-align: left;
+}
+
+.daterangepicker .calendar {
+  display: none;
+  max-width: 270px;
+}
+
+.daterangepicker.show-calendar .calendar {
+  display: block;
+}
+
+.daterangepicker .calendar.single .calendar-table {
+  border: none;
+}
+
+/* Calendars */
+
+.daterangepicker .calendar th, .daterangepicker .calendar td {
+  white-space: nowrap;
+  text-align: center;
+  min-width: 32px;
+}
+
+.daterangepicker .calendar-table {
+  border: 1px solid #ddd;
+  padding: 4px;
+  border-radius: 4px;
+  background: #fff;
+}
+
+.daterangepicker .calendar.left .calendar-table {
+  border-right: none;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+.daterangepicker .calendar.right .calendar-table {
+  border-left: none;
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;  
+}
+
+.daterangepicker .calendar.left {
+  margin: 4px 0 4px 4px;
+}
+
+.daterangepicker .calendar.right {
+  margin: 4px 4px 4px 0;
+}
+
+.daterangepicker .calendar.left .calendar-table {
+  padding-right: 12px;
+}
+
+.daterangepicker table {
+  width: 100%;
+  margin: 0;
+}
+
+.daterangepicker td, .daterangepicker th {
+  text-align: center;
+  width: 20px;
+  height: 20px;
+  border-radius: 4px;
+  white-space: nowrap;
+  cursor: pointer;
+}
+
+.daterangepicker td.off, .daterangepicker td.off.in-range, .daterangepicker td.off.start-date, .daterangepicker td.off.end-date {
+  color: #999;
+  background: #fff;
+}
+
+.daterangepicker td.disabled, .daterangepicker option.disabled {
+  color: #999;
+}
+
+.daterangepicker td.available:hover, .daterangepicker th.available:hover {
+  background: #eee;
+}
+
+.daterangepicker td.in-range {
+  background: #ebf4f8;
+  border-radius: 0;
+}
+
+.daterangepicker td.start-date {
+  border-radius: 4px 0 0 4px;
+}
+
+.daterangepicker td.end-date {
+  border-radius: 0 4px 4px 0;
+}
+
+.daterangepicker td.start-date.end-date {
+  border-radius: 4px;
+}
+
+.daterangepicker td.active, .daterangepicker td.active:hover {
+  background-color: #357ebd;
+  border-color: #3071a9;
+  color: #fff;
+}
+
+.daterangepicker td.week, .daterangepicker th.week {
+  font-size: 80%;
+  color: #ccc;
+}
+
+.daterangepicker select.monthselect, .daterangepicker select.yearselect {
+  font-size: 12px;
+  padding: 1px;
+  height: auto;
+  margin: 0;
+  cursor: default;
+}
+
+.daterangepicker select.monthselect {
+  margin-right: 2%;
+  width: 56%;
+}
+
+.daterangepicker select.yearselect {
+  width: 40%;
+}
+
+.daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.secondselect, .daterangepicker select.ampmselect {
+  width: 50px;
+  margin-bottom: 0;
+}
+
+.daterangepicker th.month {
+  width: auto;
+}
+
+/* Text Input Above Each Calendar */
+
+.daterangepicker .input-mini {
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  color: #555;
+  display: block;
+  height: 30px;
+  line-height: 30px;
+  vertical-align: middle;
+  margin: 0 0 5px 0;
+  padding: 0 6px 0 28px;
+  width: 100%;
+}
+
+.daterangepicker .input-mini.active {
+  border: 1px solid #357ebd;
+}
+
+.daterangepicker .daterangepicker_input i {
+  position: absolute;
+  left: 8px;
+  top: 8px;
+}
+
+.daterangepicker .left .daterangepicker_input {
+  padding-right: 12px;
+}
+
+.daterangepicker .daterangepicker_input {
+  position: relative;
+}
+
+/* Time Picker */
+
+.daterangepicker .calendar-time {
+  text-align: center;
+  margin: 5px auto;
+  line-height: 30px;
+  position: relative;
+  padding-left: 28px;
+}
+
+.daterangepicker .calendar-time select.disabled {
+  color: #ccc;
+  cursor: not-allowed;
+}
+
+/* Predefined Ranges */
+
+.daterangepicker .ranges {
+  font-size: 11px;
+}
+
+.daterangepicker .ranges ul {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  width: 160px;
+}
+
+.daterangepicker .ranges li {
+  font-size: 13px;
+  background: #f5f5f5;
+  border: 1px solid #f5f5f5;
+  color: #08c;
+  padding: 3px 12px;
+  margin-bottom: 8px;
+  border-radius: 5px;
+  cursor: pointer;
+}
+
+.daterangepicker .ranges li.active, .daterangepicker .ranges li:hover {
+  background: #08c;
+  border: 1px solid #08c;
+  color: #fff;
+}

public/js/firefly.js

@@ -8,7 +8,6 @@ $(function () {
     ranges[previousMonthName] = [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')];
     ranges[nextMonthName] = [moment().add(1, 'month').startOf('month'), moment().add(1, 'month').endOf('month')];
     ranges[everything] = [firstDate, moment()];
-
     $('#daterange').daterangepicker(
         {
             ranges: ranges,
@@ -37,8 +36,10 @@ $(function () {
                 label: label,
                 _token: token
             }).success(function () {
+                console.log('Succesfully sent new date range.');
                 window.location.reload(true);
             }).fail(function () {
+                console.log('Could not send new date range.');
                 alert('Could not change date range');
 
             });

resources/lang/en/breadcrumbs.php

@@ -4,23 +4,15 @@ return [
 
     // accounts
     'cash_accounts'         => 'Cash accounts',
-    'new_asset_account'     => 'New asset accounts',
-    'new_expense_account'   => 'New expense account',
-    'new_revenue_account'   => 'New revenue account',
     'edit_account'          => 'Edit account ":name"',
 
-    // categories
-    'newCategory'           => 'Create a new category',
-
     // currencies
     'edit_currency'         => 'Edit currencies ":name"',
     'delete_currency'       => 'Delete currencies ":name"',
 
     // piggy banks
-    'piggyBanks'            => 'Piggy banks',
     'newPiggyBank'          => 'Create a new piggy bank',
     'edit_piggyBank'        => 'Edit piggy bank ":name"',
-    'delete_piggyBank'      => 'Delete piggy bank ":name"',
 
     // top menu
     'preferences'           => 'Preferences',

resources/lang/en/firefly.php

@@ -25,14 +25,22 @@ return [
     'removed_amount'                   => 'Removed :amount',
     'added_amount'                     => 'Added :amount',
     'asset_account_role_help'          => 'Any extra options resulting from your choice can be set later.',
+    'Opening balance'                  => 'Opening balance',
+    'create_new_stuff'                 => 'Create new stuff',
+    'new_withdrawal'                   => 'New withdrawal',
+    'new_deposit'                      => 'New deposit',
+    'new_transfer'                     => 'New transfer',
+    'new_asset_account'                => 'New asset account',
+    'new_expense_account'              => 'New expense account',
+    'new_revenue_account'              => 'New revenue account',
+    'new_budget'                       => 'New budget',
+    'new_bill'                         => 'New bill',
 
     // tags
     'store_new_tag'                    => 'Store new tag',
     'update_tag'                       => 'Update tag',
     'no_location_set'                  => 'No location set.',
     'meta_data'                        => 'Meta data',
-    'edit_tag'                         => 'Edit tag',
-    'delete_tag'                       => 'Delete tag',
     'location'                         => 'Location',
 
     // preferences
@@ -458,7 +466,11 @@ return [
     'delete_piggy_bank'                => 'Delete piggy bank ":name"',
 
     // tags
-    'delete_tag'                       => 'Delete tag ":name"',
+    'regular_tag'                      => 'Just a regular tag.',
+    'balancing_act'                    => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.',
+    'advance_payment'                  => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.',
+
+    'delete_tag'                       => 'Delete tag ":tag"',
     'new_tag'                          => 'Make new tag',
     'edit_tag'                         => 'Edit tag ":tag"',
     'no_year'                          => 'No year set',

resources/lang/en/form.php

@@ -73,7 +73,6 @@ return [
     'delete_budget'               => 'Delete budget ":name"',
     'delete_category'             => 'Delete category ":name"',
     'delete_currency'             => 'Delete currency ":name"',
-    'delete_piggyBank'            => 'Delete piggy bank ":name"',
     'delete_journal'              => 'Delete transaction with description ":description"',
     'delete_attachment'           => 'Delete attachment ":name"',
 

resources/lang/nl/breadcrumbs.php

@@ -4,23 +4,15 @@ return [
 
     // accounts
     'cash_accounts'         => 'Contant geldrekeningen',
-    'new_asset_account'     => 'Nieuwe betaalrekening',
-    'new_expense_account'   => 'Nieuwe crediteur',
-    'new_revenue_account'   => 'Nieuwe debiteur',
     'edit_account'          => 'Wijzig rekening ":name"',
 
-    // categories
-    'newCategory'           => 'Maak een nieuw categorie',
-
     // currencies
     'edit_currency'         => 'Wijzig valuta ":name"',
     'delete_currency'       => 'Verwijder valuta ":name"',
 
     // piggy banks
-    'piggyBanks'            => 'Spaarpotjes',
     'newPiggyBank'          => 'Nieuw spaarpotje',
     'edit_piggyBank'        => 'Wijzig spaarpotje ":name"',
-    'delete_piggyBank'      => 'Verwijder spaarportje ":name"',
 
     // top menu
     'preferences'           => 'Voorkeuren',

resources/lang/nl/firefly.php

@@ -25,6 +25,16 @@ return [
     'removed_amount'                   => ':amount weggehaald',
     'added_amount'                     => ':amount toegevoegd',
     'asset_account_role_help'          => 'Voorkeuren die voortkomen uit je keuze hier kan je later aangeven.',
+    'Opening balance'                  => 'Startsaldo',
+    'create_new_stuff'                 => 'Nieuw',
+    'new_withdrawal'                   => 'Nieuwe uitgave',
+    'new_deposit'                      => 'Nieuwe inkomsten',
+    'new_transfer'                     => 'Nieuwe overschrijving',
+    'new_asset_account'                => 'Nieuwe betaalrekening',
+    'new_expense_account'              => 'Nieuwe crediteur',
+    'new_revenue_account'              => 'Nieuwe debiteur',
+    'new_budget'                       => 'Nieuw budget',
+    'new_bill'                         => 'Nieuwe rekening',
 
     // tags
     'store_new_tag'                    => 'Sla tag op',
@@ -467,7 +477,10 @@ return [
     'delete_piggy_bank'                => 'Verwijder spaarpotje ":name"',
 
     // tags
-    'delete_tag'                       => 'Verwijder tag ":name"',
+    'regular_tag'                      => 'Een gewone tag.',
+    'balancing_act'                    => 'Er kunnen maar twee transacties worden getagged; een uitgaven en inkomsten. Ze balanceren elkaar.',
+    'advance_payment'                  => 'Je kan een uitgave taggen en zoveel inkomsten om de uitgave (helemaal) te compenseren.',
+    'delete_tag'                       => 'Verwijder tag ":tag"',
     'new_tag'                          => 'Maak nieuwe tag',
     'edit_tag'                         => 'Wijzig tag ":tag"',
     'no_year'                          => 'Zonder jaar',

resources/lang/nl/form.php

@@ -74,7 +74,6 @@ return [
     'delete_budget'               => 'Verwijder budget ":name"',
     'delete_category'             => 'Verwijder categorie ":name"',
     'delete_currency'             => 'Verwijder valuta ":name"',
-    'delete_piggyBank'            => 'Verwijder spaarpotje ":name"',
     'delete_journal'              => 'Verwijder transactie met omschrijving ":description"',
     'delete_attachment'           => 'Verwijder bijlage ":name"',
 

resources/twig/accounts/delete.twig

@@ -22,6 +22,7 @@
                         {{ trans('form.account_areYouSure', {'name': account.name}) }}
                     </p>
 
+                    {% if account.transactions|length > 0 or account.piggyBanks|length > 0 %}
                         <p>
                             {% if account.transactions|length > 0 %}
                                 {{ Lang.choice('form.also_delete_transactions', account.transactions|length, {count: account.transactions|length}) }}
@@ -30,7 +31,8 @@
                                 {{ Lang.choice('form.also_delete_piggyBanks', account.piggyBanks|length, {count: account.piggyBanks|length}) }}
                             {% endif %}
                         </p>
-
+                    {% endif %}
+                    {% if account.transactions|length > 0 %}
                         <p class="text-success">
                             {{ 'save_transactions_by_moving'|_ }}
                         </p>
@@ -38,6 +40,9 @@
                         <p>
                             {{ Form.select('move_account_before_delete', accountList, null, {class: 'form-control'}) }}
                         </p>
+                    {% else %}
+                        <input type="hidden" name="move_account_before_delete" value="0"/>
+                    {% endif %}
 
                 </div>
                 <div class="box-footer">

resources/twig/index.twig

@@ -163,7 +163,7 @@
                     {% else %}
                         {% for account in savings %}
                             <div class="row">
-                                <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12"><h5><a href="{{ route('accounts.show') }}">{{ account.name }}</a></h5>
+                                <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12"><h5><a href="{{ route('accounts.show', account.id) }}">{{ account.name }}</a></h5>
                                 </div>
                             </div>
                             <div class="row">
@@ -230,7 +230,7 @@
                     {% else %}
                         {% for account in piggyBankAccounts %}
                             <div class="row">
-                                <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12"><h5><a href="{{ route('accounts.show') }}">{{ account.name }}</a></h5>
+                                <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12"><h5><a href="{{ route('accounts.show', account.id) }}">{{ account.name }}</a></h5>
                                 </div>
                             </div>
                             <div class="row">

resources/twig/layout/default.twig

@@ -17,7 +17,7 @@
     <link href="font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css"/>
     <link href="dist/css/AdminLTE.min.css" rel="stylesheet" type="text/css"/>
     <link href="dist/css/skins/skin-blue-light.min.css" rel="stylesheet" type="text/css"/>
-    <link href="css/daterangepicker-bs3.css" rel="stylesheet" type="text/css"/>
+    <link href="css/daterangepicker.css" rel="stylesheet" type="text/css"/>
     <link href="css/firefly.css" rel="stylesheet" type="text/css"/>
     <link href="css/bootstrap-tour.min.css" rel="stylesheet" type="text/css"/>
 
@@ -58,17 +58,17 @@
 
                     <!-- Messages: style can be found in dropdown.less-->
                     <li>
-                        <a href="#">
+                        <span style="color:#fff;padding: 15px;display: block;line-height: 20px;">
                             <span class="hidden-xs" id="daterange"></span>
-                        </a>
+                        </span>
                     </li>
 
                     <!-- Notifications: style can be found in dropdown.less -->
                     <!-- User Account: style can be found in dropdown.less -->
                     <li class="dropdown user user-menu">
-                        <a href="#">
+                        <span style="cursor:default;color:#fff;padding: 15px;display: block;line-height: 20px;">
                             <span class="hidden-xs">{{ Auth.user.email }}</span>
-                        </a>
+                        </span>
                     </li>
                     <li id="sidebar-toggle">
                         <a href="#" data-toggle="control-sidebar"><i class="fa fa-plus-circle"></i></a>

resources/twig/partials/control-bar.twig

@@ -4,14 +4,14 @@
     <div class="tab-content">
         <!-- Home tab content -->
         <div class="tab-panel active" id="control-sidebar-home-tab">
-            <h3 class="control-sidebar-heading">Create new stuff</h3>
+            <h3 class="control-sidebar-heading">{{ 'create_new_stuff'|_ }}</h3>
             <ul class='control-sidebar-menu'>
                 <li>
                     <a href="{{ route('transactions.create', 'withdrawal') }}">
                         <i class="menu-icon fa fa-long-arrow-left bg-red"></i>
 
                         <div class="menu-info">
-                            <h4 class="control-sidebar-subheading">New withdrawal</h4>
+                            <h4 class="control-sidebar-subheading">{{ 'new_withdrawal'|_ }}</h4>
                         </div>
                     </a>
                 </li>
@@ -20,7 +20,7 @@
                         <i class="menu-icon fa fa-long-arrow-right bg-green"></i>
 
                         <div class="menu-info">
-                            <h4 class="control-sidebar-subheading">New deposit</h4>
+                            <h4 class="control-sidebar-subheading">{{ 'new_deposit'|_ }}</h4>
                         </div>
                     </a>
                 </li>
@@ -29,7 +29,7 @@
                         <i class="menu-icon fa fa-exchange bg-blue"></i>
 
                         <div class="menu-info">
-                            <h4 class="control-sidebar-subheading">New transfer</h4>
+                            <h4 class="control-sidebar-subheading">{{ 'new_transfer'|_ }}</h4>
                         </div>
                     </a>
                 </li>
@@ -38,7 +38,7 @@
                         <i class="menu-icon fa fa-money bg-maroon"></i>
 
                         <div class="menu-info">
-                            <h4 class="control-sidebar-subheading">New asset account</h4>
+                            <h4 class="control-sidebar-subheading">{{ 'new_asset_account'|_ }}</h4>
                         </div>
                     </a>
                 </li>
@@ -47,7 +47,7 @@
                         <i class="menu-icon fa fa-shopping-cart bg-maroon"></i>
 
                         <div class="menu-info">
-                            <h4 class="control-sidebar-subheading">New expense account</h4>
+                            <h4 class="control-sidebar-subheading">{{ 'new_expense_account'|_ }}</h4>
                         </div>
                     </a>
                 </li>
@@ -56,16 +56,47 @@
                         <i class="menu-icon fa fa-download bg-maroon"></i>
 
                         <div class="menu-info">
-                            <h4 class="control-sidebar-subheading">New revenue</h4>
+                            <h4 class="control-sidebar-subheading">{{ 'new_revenue_account'|_ }}</h4>
                         </div>
                     </a>
                 </li>
+
+                <li>
+                    <a href="{{ route('budgets.create') }}">
+                        <i class="menu-icon fa fa-download bg-red"></i>
+
+                        <div class="menu-info">
+                            <h4 class="control-sidebar-subheading">{{ 'new_budget'|_ }}</h4>
+                        </div>
+                    </a>
+                </li>
+
+                <li>
+                    <a href="{{ route('categories.create') }}">
+                        <i class="menu-icon fa fa-download bg-red"></i>
+
+                        <div class="menu-info">
+                            <h4 class="control-sidebar-subheading">{{ 'new_category'|_ }}</h4>
+                        </div>
+                    </a>
+                </li>
+
+                <li>
+                    <a href="{{ route('accounts.create', 'revenue') }}">
+                        <i class="menu-icon fa fa-download bg-maroon"></i>
+
+                        <div class="menu-info">
+                            <h4 class="control-sidebar-subheading">{{ 'new_revenue_account'|_ }}</h4>
+                        </div>
+                    </a>
+                </li>
+
                 <li>
                     <a href="{{ route('piggy-banks.create') }}">
                         <i class="menu-icon fa fa-sort-amount-asc bg-teal"></i>
 
                         <div class="menu-info">
-                            <h4 class="control-sidebar-subheading">New piggy bank</h4>
+                            <h4 class="control-sidebar-subheading">{{ 'new_piggy_bank'|_ }}</h4>
                         </div>
                     </a>
                 </li>
@@ -74,7 +105,7 @@
                         <i class="menu-icon fa fa-download bg-purple"></i>
 
                         <div class="menu-info">
-                            <h4 class="control-sidebar-subheading">New bill</h4>
+                            <h4 class="control-sidebar-subheading">{{ 'new_bill'|_ }}</h4>
                         </div>
                     </a>
                 </li>

resources/twig/piggy-banks/delete.twig

@@ -10,7 +10,7 @@
         <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">
             <div class="box box-danger">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ trans('form.delete_piggyBank', {'name': piggyBank.name}) }}</h3>
+                    <h3 class="box-title">{{ trans('firefly.delete_piggy_bank', {'name': piggyBank.name}) }}</h3>
                 </div>
                 <div class="box-body">
                     <p class="text-danger">

resources/twig/tags/show.twig

@@ -19,8 +19,8 @@
                         <div class="btn-group">
                             <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button>
                             <ul class="dropdown-menu" role="menu">
-                                <li><a href="{{ route('tags.edit',tag.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ 'edit_tag'|_ }}</a></li>
-                                <li><a href="{{ route('tags.delete',tag.id) }}"><i class="fa fa-trash fa-fw"></i> {{ 'delete_tag'|_ }}</a></li>
+                                <li><a href="{{ route('tags.edit',tag.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ trans('firefly.edit_tag',{tag: tag.tag}) }}</a></li>
+                                <li><a href="{{ route('tags.delete',tag.id) }}"><i class="fa fa-trash fa-fw"></i> {{ trans('firefly.delete_tag',{tag: tag.tag}) }}</a></li>
                             </ul>
                         </div>
                     </div>
@@ -50,8 +50,8 @@
                         <div class="btn-group">
                             <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button>
                             <ul class="dropdown-menu" role="menu">
-                                <li><a href="{{ route('tags.edit',tag.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ 'edit_tag'|_ }}</a></li>
-                                <li><a href="{{ route('tags.delete',tag.id) }}"><i class="fa fa-trash fa-fw"></i> {{ 'delete_tag'|_ }}</a></li>
+                                <li><a href="{{ route('tags.edit',tag.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ trans('firefly.edit_tag',{tag: tag.tag}) }}</a></li>
+                                <li><a href="{{ route('tags.delete',tag.id) }}"><i class="fa fa-trash fa-fw"></i> {{ trans('firefly.delete_tag',{tag: tag.tag}) }}</a></li>
                             </ul>
                         </div>
                     </div>
@@ -80,8 +80,8 @@
                         <div class="btn-group">
                             <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button>
                             <ul class="dropdown-menu" role="menu">
-                                <li><a href="{{ route('tags.edit',tag.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ 'edit_tag'|_ }}</a></li>
-                                <li><a href="{{ route('tags.delete',tag.id) }}"><i class="fa fa-trash fa-fw"></i> {{ 'delete_tag'|_ }}</a></li>
+                                <li><a href="{{ route('tags.edit',tag.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ trans('firefly.edit_tag',{tag: tag.tag}) }}</a></li>
+                                <li><a href="{{ route('tags.delete',tag.id) }}"><i class="fa fa-trash fa-fw"></i> {{ trans('firefly.delete_tag',{tag: tag.tag}) }}</a></li>
                             </ul>
                         </div>
                     </div>