From 5957cf5ff86051038b596e8e49db3315cc99e520 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 8 Mar 2017 20:37:40 +0100 Subject: [PATCH 001/151] Remove space. [skip ci] --- resources/lang/en_US/firefly.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 024a0e22ac..b6aceb646d 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -854,7 +854,7 @@ return [ 'tag_title_nothing' => 'Default tags', 'tag_title_balancingAct' => 'Balancing act tags', 'tag_title_advancePayment' => 'Advance payment tags', - 'tags_introduction' => 'Usually tags are singular words, designed to quickly band items together using things like expensive, bill or for-party. In Firefly III, tags can have more properties such as a date, description and location. This allows you to join transactions together in a more meaningful way. For example, you could make a tag called Christmas dinner with friends and add information about the restaurant. Such tags are "singular", you would only use them for a single occasion, perhaps with multiple transactions.', + 'tags_introduction' => 'Usually tags are singular words, designed to quickly band items together using things like expensive, bill or for-party. In Firefly III, tags can have more properties such as a date, description and location. This allows you to join transactions together in a more meaningful way. For example, you could make a tag called Christmas dinner with friends and add information about the restaurant. Such tags are "singular", you would only use them for a single occasion, perhaps with multiple transactions.', 'tags_group' => 'Tags group transactions together, which makes it possible to store reimbursements (in case you front money for others) and other "balancing acts" where expenses are summed up (the payments on your new TV) or where expenses and deposits are cancelling each other out (buying something with saved money). It\'s all up to you. Using tags the old-fashioned way is of course always possible.', 'tags_start' => 'Create a tag to get started or enter tags when creating new transactions.', From 176c44e2b9944a8d9021860d50b0aa11587a2360 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 8 Mar 2017 20:38:08 +0100 Subject: [PATCH 002/151] Remove newline [skip ci] --- app/Http/Controllers/Transaction/ConvertController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Http/Controllers/Transaction/ConvertController.php b/app/Http/Controllers/Transaction/ConvertController.php index 0a182cf2b3..efae285b27 100644 --- a/app/Http/Controllers/Transaction/ConvertController.php +++ b/app/Http/Controllers/Transaction/ConvertController.php @@ -173,7 +173,6 @@ class ConvertController extends Controller $joined = $sourceType->type . '-' . $destinationType->type; switch ($joined) { default: - throw new FireflyException('Cannot handle ' . $joined); // @codeCoverageIgnore case TransactionType::WITHDRAWAL . '-' . TransactionType::DEPOSIT: // one $destination = $sourceAccount; From 46c9967a68cd6aa600161163220cdf867b9ce3d2 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 8 Mar 2017 20:40:23 +0100 Subject: [PATCH 003/151] New translations firefly.php (Portuguese, Brazilian) --- resources/lang/pt_BR/firefly.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php index d28429962d..55bc416748 100644 --- a/resources/lang/pt_BR/firefly.php +++ b/resources/lang/pt_BR/firefly.php @@ -854,7 +854,7 @@ return [ 'tag_title_nothing' => 'Tags padrões', 'tag_title_balancingAct' => 'Saldo das tags', 'tag_title_advancePayment' => 'Tags de pagamento do adiantamento', - 'tags_introduction' => 'Geralmente tags são palavras singulares, projetadas para rapidamente agrupar itens usando coisas como caro, conta ou para a festa. Em Firefly III, tags podem ter propriedades mais como uma data, descrição e localização. Isso permite que você una as operações de uma forma mais significativa. Por exemplo, você poderia fazer uma tag chamada ceia de Natal com amigos e adicionar informações sobre o restaurante. Tais tags são "singulares", só use-as para uma ocasião única, talvez com várias transações.', + 'tags_introduction' => 'Usually tags are singular words, designed to quickly band items together using things like expensive, bill or for-party. In Firefly III, tags can have more properties such as a date, description and location. This allows you to join transactions together in a more meaningful way. For example, you could make a tag called Christmas dinner with friends and add information about the restaurant. Such tags are "singular", you would only use them for a single occasion, perhaps with multiple transactions.', 'tags_group' => 'Tags agrupam transações, que torna possível armazenar os reembolsos (no caso você empreste dinheiro para os outros) e outros "balancetes" onde as despesas são somadas (os pagamentos na sua TV nova) ou onde as despesas e depósitos estão anulando uns aos outros (compra algo com dinheiro guardado). Isso é tudo para você. Usando tags à moda antiga claro é sempre possível.', 'tags_start' => 'Crie uma tag para começar ou insira tags ao criar novas transações.', From ecfb5e4711336cefcd8988d0c0f4b9db556e626b Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 8 Mar 2017 20:40:26 +0100 Subject: [PATCH 004/151] New translations firefly.php (Polish) --- resources/lang/pl_PL/firefly.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php index 41aa764eb8..b4bc54902f 100644 --- a/resources/lang/pl_PL/firefly.php +++ b/resources/lang/pl_PL/firefly.php @@ -854,7 +854,7 @@ return [ 'tag_title_nothing' => 'Domyślne tagi', 'tag_title_balancingAct' => 'Balancing act tags', 'tag_title_advancePayment' => 'Advance payment tags', - 'tags_introduction' => 'Usually tags are singular words, designed to quickly band items together using things like expensive, bill or for-party. In Firefly III, tags can have more properties such as a date, description and location. This allows you to join transactions together in a more meaningful way. For example, you could make a tag called Christmas dinner with friends and add information about the restaurant. Such tags are "singular", you would only use them for a single occasion, perhaps with multiple transactions.', + 'tags_introduction' => 'Usually tags are singular words, designed to quickly band items together using things like expensive, bill or for-party. In Firefly III, tags can have more properties such as a date, description and location. This allows you to join transactions together in a more meaningful way. For example, you could make a tag called Christmas dinner with friends and add information about the restaurant. Such tags are "singular", you would only use them for a single occasion, perhaps with multiple transactions.', 'tags_group' => 'Tags group transactions together, which makes it possible to store reimbursements (in case you front money for others) and other "balancing acts" where expenses are summed up (the payments on your new TV) or where expenses and deposits are cancelling each other out (buying something with saved money). It\'s all up to you. Using tags the old-fashioned way is of course always possible.', 'tags_start' => 'Create a tag to get started or enter tags when creating new transactions.', From c0aad385cd3a7f3428514b1c56060b0e15b6afba Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 8 Mar 2017 20:40:33 +0100 Subject: [PATCH 005/151] New translations firefly.php (German) --- resources/lang/de_DE/firefly.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php index df1d621931..4ab31f014a 100644 --- a/resources/lang/de_DE/firefly.php +++ b/resources/lang/de_DE/firefly.php @@ -855,7 +855,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?', 'tag_title_nothing' => 'Standard-Tags', 'tag_title_balancingAct' => 'Ausgleich Tags', 'tag_title_advancePayment' => 'Vorauszahlung Tags', - 'tags_introduction' => 'In der Regel sind Tags einzelne Worte, erdacht um Einträge mit Begriffen wie Ausgaben, Rechnungen oder Partyvorbereitung schnell zusammenzufassen. In Firefly III können Tags weitere Eigenschaften wie ein Datum, eine Beschreibung und einen Ort enthalten. Dieses erlaubt es Ihnen Transaktionen in sinnvoller Weise miteinander zu verknüpfen. Zum Beispiel können Sie einen Tag mit dem Titel Weihnachtsessen mit Freunden erstellen und Informationen über das Restaurant hinzufügen. Solche Tags sind "einzigartig", sie werden nur für einen Anlass genutzt, enthalten aber eventuell mehrere Transaktionen.', + 'tags_introduction' => 'Usually tags are singular words, designed to quickly band items together using things like expensive, bill or for-party. In Firefly III, tags can have more properties such as a date, description and location. This allows you to join transactions together in a more meaningful way. For example, you could make a tag called Christmas dinner with friends and add information about the restaurant. Such tags are "singular", you would only use them for a single occasion, perhaps with multiple transactions.', 'tags_group' => 'Tags group transactions together, which makes it possible to store reimbursements (in case you front money for others) and other "balancing acts" where expenses are summed up (the payments on your new TV) or where expenses and deposits are cancelling each other out (buying something with saved money). It\'s all up to you. Using tags the old-fashioned way is of course always possible.', 'tags_start' => 'Create a tag to get started or enter tags when creating new transactions.', From 6b8ec544c18edeb24a8dc1ff8e819497eb75af21 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 8 Mar 2017 20:40:44 +0100 Subject: [PATCH 006/151] New translations firefly.php (Spanish) --- resources/lang/es_ES/firefly.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php index 5e7b466870..35529bd959 100644 --- a/resources/lang/es_ES/firefly.php +++ b/resources/lang/es_ES/firefly.php @@ -854,7 +854,7 @@ return [ 'tag_title_nothing' => 'Default tags', 'tag_title_balancingAct' => 'Balancing act tags', 'tag_title_advancePayment' => 'Advance payment tags', - 'tags_introduction' => 'Usually tags are singular words, designed to quickly band items together using things like expensive, bill or for-party. In Firefly III, tags can have more properties such as a date, description and location. This allows you to join transactions together in a more meaningful way. For example, you could make a tag called Christmas dinner with friends and add information about the restaurant. Such tags are "singular", you would only use them for a single occasion, perhaps with multiple transactions.', + 'tags_introduction' => 'Usually tags are singular words, designed to quickly band items together using things like expensive, bill or for-party. In Firefly III, tags can have more properties such as a date, description and location. This allows you to join transactions together in a more meaningful way. For example, you could make a tag called Christmas dinner with friends and add information about the restaurant. Such tags are "singular", you would only use them for a single occasion, perhaps with multiple transactions.', 'tags_group' => 'Tags group transactions together, which makes it possible to store reimbursements (in case you front money for others) and other "balancing acts" where expenses are summed up (the payments on your new TV) or where expenses and deposits are cancelling each other out (buying something with saved money). It\'s all up to you. Using tags the old-fashioned way is of course always possible.', 'tags_start' => 'Create a tag to get started or enter tags when creating new transactions.', From 55fcb97a10cc8399f39c582220acdad6edcca41a Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 8 Mar 2017 20:40:50 +0100 Subject: [PATCH 007/151] New translations firefly.php (Dutch) --- resources/lang/nl_NL/firefly.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php index bdf2483bcb..dcf794bdea 100644 --- a/resources/lang/nl_NL/firefly.php +++ b/resources/lang/nl_NL/firefly.php @@ -854,7 +854,7 @@ return [ 'tag_title_nothing' => 'Standaard tags', 'tag_title_balancingAct' => 'Balancerende tags', 'tag_title_advancePayment' => 'Vooruitbetaalde tags', - 'tags_introduction' => 'Normaal gesproken zijn tags enkele woorden, gebruikt om gerelateerde zaken snel aan elkaar te plakken. dure-aanschaf, rekening, feestje. In Firefly III hebben tags meer betekenis en kan je er een datum, omschrijving en locatie aan geven. Daarmee kan je je transacties op een wat zinvollere manier aan elkaar koppelen. Je kan bijvoorbeeld een tag Kerstdiner maken en informatie over het restaurant meenemen. Zulke tags zijn enkelvoudig; je gebruikt ze maar bij één gelegenheid.', + 'tags_introduction' => 'Usually tags are singular words, designed to quickly band items together using things like expensive, bill or for-party. In Firefly III, tags can have more properties such as a date, description and location. This allows you to join transactions together in a more meaningful way. For example, you could make a tag called Christmas dinner with friends and add information about the restaurant. Such tags are "singular", you would only use them for a single occasion, perhaps with multiple transactions.', 'tags_group' => 'Omdat tags transacties groeperen kan je er teruggaves, vergoedingen en andere geldzaken mee aanduiden, zolang de transacties elkaar "opheffen". Hoe je dit aanpakt is aan jou. De gewone manier kan natuurlijk ook.', 'tags_start' => 'Maak hieronder een tag, of voer nieuwe tags in als je nieuwe transacties maakt.', From 14ef6b753cca3c5a72c9b01b0d4cbb9f248dde74 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 8 Mar 2017 20:40:56 +0100 Subject: [PATCH 008/151] New translations firefly.php (Russian) --- resources/lang/ru_RU/firefly.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/ru_RU/firefly.php b/resources/lang/ru_RU/firefly.php index 5e7b466870..35529bd959 100644 --- a/resources/lang/ru_RU/firefly.php +++ b/resources/lang/ru_RU/firefly.php @@ -854,7 +854,7 @@ return [ 'tag_title_nothing' => 'Default tags', 'tag_title_balancingAct' => 'Balancing act tags', 'tag_title_advancePayment' => 'Advance payment tags', - 'tags_introduction' => 'Usually tags are singular words, designed to quickly band items together using things like expensive, bill or for-party. In Firefly III, tags can have more properties such as a date, description and location. This allows you to join transactions together in a more meaningful way. For example, you could make a tag called Christmas dinner with friends and add information about the restaurant. Such tags are "singular", you would only use them for a single occasion, perhaps with multiple transactions.', + 'tags_introduction' => 'Usually tags are singular words, designed to quickly band items together using things like expensive, bill or for-party. In Firefly III, tags can have more properties such as a date, description and location. This allows you to join transactions together in a more meaningful way. For example, you could make a tag called Christmas dinner with friends and add information about the restaurant. Such tags are "singular", you would only use them for a single occasion, perhaps with multiple transactions.', 'tags_group' => 'Tags group transactions together, which makes it possible to store reimbursements (in case you front money for others) and other "balancing acts" where expenses are summed up (the payments on your new TV) or where expenses and deposits are cancelling each other out (buying something with saved money). It\'s all up to you. Using tags the old-fashioned way is of course always possible.', 'tags_start' => 'Create a tag to get started or enter tags when creating new transactions.', From 292b3672e21aff451f2d54e2ef65ff1bec5564cb Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 8 Mar 2017 20:41:14 +0100 Subject: [PATCH 009/151] New translations firefly.php (Chinese Traditional, Hong Kong) --- resources/lang/zh_HK/firefly.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/zh_HK/firefly.php b/resources/lang/zh_HK/firefly.php index 5e7b466870..35529bd959 100644 --- a/resources/lang/zh_HK/firefly.php +++ b/resources/lang/zh_HK/firefly.php @@ -854,7 +854,7 @@ return [ 'tag_title_nothing' => 'Default tags', 'tag_title_balancingAct' => 'Balancing act tags', 'tag_title_advancePayment' => 'Advance payment tags', - 'tags_introduction' => 'Usually tags are singular words, designed to quickly band items together using things like expensive, bill or for-party. In Firefly III, tags can have more properties such as a date, description and location. This allows you to join transactions together in a more meaningful way. For example, you could make a tag called Christmas dinner with friends and add information about the restaurant. Such tags are "singular", you would only use them for a single occasion, perhaps with multiple transactions.', + 'tags_introduction' => 'Usually tags are singular words, designed to quickly band items together using things like expensive, bill or for-party. In Firefly III, tags can have more properties such as a date, description and location. This allows you to join transactions together in a more meaningful way. For example, you could make a tag called Christmas dinner with friends and add information about the restaurant. Such tags are "singular", you would only use them for a single occasion, perhaps with multiple transactions.', 'tags_group' => 'Tags group transactions together, which makes it possible to store reimbursements (in case you front money for others) and other "balancing acts" where expenses are summed up (the payments on your new TV) or where expenses and deposits are cancelling each other out (buying something with saved money). It\'s all up to you. Using tags the old-fashioned way is of course always possible.', 'tags_start' => 'Create a tag to get started or enter tags when creating new transactions.', From 91125d20efe15367e23c3c0adef3e736692eb5f3 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 8 Mar 2017 20:41:19 +0100 Subject: [PATCH 010/151] New translations firefly.php (Croatian) --- resources/lang/hr_HR/firefly.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/hr_HR/firefly.php b/resources/lang/hr_HR/firefly.php index 5e7b466870..35529bd959 100644 --- a/resources/lang/hr_HR/firefly.php +++ b/resources/lang/hr_HR/firefly.php @@ -854,7 +854,7 @@ return [ 'tag_title_nothing' => 'Default tags', 'tag_title_balancingAct' => 'Balancing act tags', 'tag_title_advancePayment' => 'Advance payment tags', - 'tags_introduction' => 'Usually tags are singular words, designed to quickly band items together using things like expensive, bill or for-party. In Firefly III, tags can have more properties such as a date, description and location. This allows you to join transactions together in a more meaningful way. For example, you could make a tag called Christmas dinner with friends and add information about the restaurant. Such tags are "singular", you would only use them for a single occasion, perhaps with multiple transactions.', + 'tags_introduction' => 'Usually tags are singular words, designed to quickly band items together using things like expensive, bill or for-party. In Firefly III, tags can have more properties such as a date, description and location. This allows you to join transactions together in a more meaningful way. For example, you could make a tag called Christmas dinner with friends and add information about the restaurant. Such tags are "singular", you would only use them for a single occasion, perhaps with multiple transactions.', 'tags_group' => 'Tags group transactions together, which makes it possible to store reimbursements (in case you front money for others) and other "balancing acts" where expenses are summed up (the payments on your new TV) or where expenses and deposits are cancelling each other out (buying something with saved money). It\'s all up to you. Using tags the old-fashioned way is of course always possible.', 'tags_start' => 'Create a tag to get started or enter tags when creating new transactions.', From 789412ee6a63a8701f54ebae9a71a90e62d188b0 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 8 Mar 2017 20:41:28 +0100 Subject: [PATCH 011/151] New translations firefly.php (Chinese Traditional) --- resources/lang/zh_TW/firefly.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php index 41ef313fb7..4f58590d02 100644 --- a/resources/lang/zh_TW/firefly.php +++ b/resources/lang/zh_TW/firefly.php @@ -854,7 +854,7 @@ return [ 'tag_title_nothing' => '預設標籤', 'tag_title_balancingAct' => '抵銷行為標籤', 'tag_title_advancePayment' => '預付款標籤', - 'tags_introduction' => '標籤通常是一些方便分類的短語，例如 很貴， 賬單 或者 派對用品。 在 Firefly III 裡，標籤可以有不同的屬性，例如日期、描述、或位置。這能方便你更有意義地把交易分類。例如，你可以建立一個 與朋友一起吃聖誕大餐的標籤，並加上餐廳的資訊。這類的標籤標籤是 「即棄」 的，你只會在一次事件中使用它，而標籤可能有多個交易。', + 'tags_introduction' => 'Usually tags are singular words, designed to quickly band items together using things like expensive, bill or for-party. In Firefly III, tags can have more properties such as a date, description and location. This allows you to join transactions together in a more meaningful way. For example, you could make a tag called Christmas dinner with friends and add information about the restaurant. Such tags are "singular", you would only use them for a single occasion, perhaps with multiple transactions.', 'tags_group' => '標籤可以把交易進行分組，容許你記錄報銷（你為其他人墊支），或者其他「抵銷行為」——例如分期付款（買電視機的時候），或者支出和收入會互相抵銷（以儲蓄買東西）的交易。當然，你也可以建立普通的標籤，隨你喜歡。', 'tags_start' => '要開始使用，請新增標籤或在建立新交易紀錄時輸入標籤。', From 9a033ac62a546e8ac257899a968ecdc0f13fd021 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 8 Mar 2017 20:41:39 +0100 Subject: [PATCH 012/151] New translations firefly.php (French) --- resources/lang/fr_FR/firefly.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php index 152407d963..88fc43f9cb 100644 --- a/resources/lang/fr_FR/firefly.php +++ b/resources/lang/fr_FR/firefly.php @@ -854,7 +854,7 @@ return [ 'tag_title_nothing' => 'Tags par défaut', 'tag_title_balancingAct' => 'Balancing act tags', 'tag_title_advancePayment' => 'Tags de paiement anticipé', - 'tags_introduction' => 'Les tags sont généralement des mots au singulier, conçus pour grouper rapidement des éléments en utilisant des mots comme cher, factures ou pour-fêtes. Dans Firefly III, les tags peuvent avoir plus de propriétés comme une date, la description et l’emplacement. Cela vous permet de réunir des opérations de façon plus significative. Par exemple, vous pourriez faire un tag appelé Dîner de Noël avec des amis et ajouter des informations sur le restaurant. Ces tags sont au singulier, vous devez seulement les utiliser pour une occasion unique, peut-être avec plusieurs opérations.', + 'tags_introduction' => 'Usually tags are singular words, designed to quickly band items together using things like expensive, bill or for-party. In Firefly III, tags can have more properties such as a date, description and location. This allows you to join transactions together in a more meaningful way. For example, you could make a tag called Christmas dinner with friends and add information about the restaurant. Such tags are "singular", you would only use them for a single occasion, perhaps with multiple transactions.', 'tags_group' => 'Les tags groupent des opérations ensemble, ce qui permet de stocker des remboursements (dans le cas où vous avancer de l\'argent aux autres) et d\'autres types "d\'équilibres" où résumer les dépenses (les remboursements de votre nouvelle TV) ou quand les dépenses et les dépôts s\'annulent les uns les autres (achat de quelque chose avec de l\'argent mis de coté). C\'est comme vous souhaitez. Utiliser les tags à l\'ancienne est toujours possible.', 'tags_start' => 'Create a tag to get started or enter tags when creating new transactions.', From 0e59f7433cd80189410d6ed11fa6746b125f1efb Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 9 Mar 2017 08:19:05 +0100 Subject: [PATCH 013/151] Code and tests for #615 --- .../Transaction/MassController.php | 19 ++-- resources/views/transactions/mass/edit.twig | 89 ++++++++++++------- .../Transaction/MassControllerTest.php | 5 ++ 3 files changed, 72 insertions(+), 41 deletions(-) diff --git a/app/Http/Controllers/Transaction/MassController.php b/app/Http/Controllers/Transaction/MassController.php index 0457d4d677..dfff2e24b7 100644 --- a/app/Http/Controllers/Transaction/MassController.php +++ b/app/Http/Controllers/Transaction/MassController.php @@ -14,13 +14,13 @@ declare(strict_types = 1); namespace FireflyIII\Http\Controllers\Transaction; use Carbon\Carbon; -use ExpandedForm; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\MassDeleteJournalRequest; use FireflyIII\Http\Requests\MassEditJournalRequest; use FireflyIII\Models\AccountType; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Illuminate\Support\Collection; use Preferences; @@ -118,8 +118,13 @@ class MassController extends Controller $subTitle = trans('firefly.mass_edit_journals'); /** @var AccountRepositoryInterface $repository */ - $repository = app(AccountRepositoryInterface::class); - $accountList = ExpandedForm::makeSelectList($repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET])); + $repository = app(AccountRepositoryInterface::class); + $accounts = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]); + + // get budgets + /** @var BudgetRepositoryInterface $budgetRepository */ + $budgetRepository = app(BudgetRepositoryInterface::class); + $budgets = $budgetRepository->getBudgets(); // skip transactions that have multiple destinations // or multiple sources: @@ -177,7 +182,7 @@ class MassController extends Controller $journals = $filtered; - return view('transactions.mass.edit', compact('journals', 'subTitle', 'accountList')); + return view('transactions.mass.edit', compact('journals', 'subTitle', 'accounts', 'budgets')); } /** @@ -200,7 +205,7 @@ class MassController extends Controller $sourceAccountName = $request->get('source_account_name')[$journal->id] ?? ''; $destAccountId = $request->get('destination_account_id')[$journal->id] ?? 0; $destAccountName = $request->get('destination_account_name')[$journal->id] ?? ''; - $budgetId = $journal->budgets->first() ? $journal->budgets->first()->id : 0; + $budgetId = $request->get('budget_id')[$journal->id] ?? 0; $category = $request->get('category')[$journal->id]; $tags = $journal->tags->pluck('tag')->toArray(); @@ -214,12 +219,12 @@ class MassController extends Controller 'destination_account_id' => intval($destAccountId), 'destination_account_name' => $destAccountName, 'amount' => round($request->get('amount')[$journal->id], 12), - 'currency_id' => intval($request->get('amount_currency_id_amount_' . $journal->id)), + 'currency_id' => $journal->transaction_currency_id, 'date' => new Carbon($request->get('date')[$journal->id]), 'interest_date' => $journal->interest_date, 'book_date' => $journal->book_date, 'process_date' => $journal->process_date, - 'budget_id' => $budgetId, + 'budget_id' => intval($budgetId), 'category' => $category, 'tags' => $tags, diff --git a/resources/views/transactions/mass/edit.twig b/resources/views/transactions/mass/edit.twig index f4dfb503a9..4f47734b4d 100644 --- a/resources/views/transactions/mass/edit.twig +++ b/resources/views/transactions/mass/edit.twig @@ -22,66 +22,87 @@   - {{ trans('list.description') }} + {{ trans('list.description') }} {{ trans('list.amount') }} {{ trans('list.date') }} {{ trans('list.from') }} {{ trans('list.to') }} {{ trans('list.category') }} + {{ trans('list.budget') }} {% for journal in journals %} {% if journal.transaction_count == 2 %} - - - - + {# LINK TO EDIT FORM #} + - - - - - - {{ ExpandedForm.amountSmall('amount_'~journal.id, journal.amount, {'name' : 'amount['~journal.id~']', 'currency' : journal.transactionCurrency}) }} - - - - + {# DESCRIPTION #} + +
+ {{ journal.transactionCurrency.symbol }} + +
- + + + {# DATE #} + + + + {# SOURCE ACCOUNT ID FOR TRANSFER OR WITHDRAWAL #} {% if journal.transaction_type_type == 'Transfer' or journal.transaction_type_type == 'Withdrawal' %} - {{ Form.select('source_account_id['~journal.id~']', accountList, journal.source_account_id, {'class': 'form-control'}) }} + {% else %} - - {{ Form.input('text', 'source_account_name['~journal.id~']', journal.source_account_name, {'class': 'form-control', 'placeholder': trans('form.revenue_account')}) }} + {# SOURCE ACCOUNT NAME FOR DEPOSIT #} + {% endif %} - - {% if journal.transaction_type_type == 'Transfer' or journal.transaction_type_type == 'Deposit' %} - - {{ Form.select('destination_account_id['~journal.id~']', accountList, journal.destination_account_id, {'class': 'form-control'}) }} + {# DESTINATION ACCOUNT NAME FOR TRANSFER AND DEPOSIT #} + {% else %} - - - {{ Form.input('text', 'destination_account_name['~journal.id~']', journal.destination_account_name, {'class': 'form-control', 'placeholder': trans('form.expense_account')}) }} + {# DESTINATION ACCOUNT NAME FOR EXPENSE #} + {% endif %} - + {# category #} - {{ Form.input('text', 'category['~journal.id~']', journal.categories[0].name, {'class': 'form-control', 'placeholder': trans('form.category')}) }} + + + {# budget #} + + {% if journal.transaction_type_type == 'Withdrawal' %} + + {% endif %} {% endif %} diff --git a/tests/Feature/Controllers/Transaction/MassControllerTest.php b/tests/Feature/Controllers/Transaction/MassControllerTest.php index 342380be36..c662c2c6b5 100644 --- a/tests/Feature/Controllers/Transaction/MassControllerTest.php +++ b/tests/Feature/Controllers/Transaction/MassControllerTest.php @@ -16,6 +16,7 @@ use DB; use FireflyIII\Models\AccountType; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Illuminate\Support\Collection; use Log; @@ -77,6 +78,10 @@ class MassControllerTest extends TestCase $repository = $this->mock(AccountRepositoryInterface::class); $repository->shouldReceive('getAccountsByType')->once()->withArgs([[AccountType::DEFAULT, AccountType::ASSET]])->andReturn(new Collection); + // mock more stuff: + $budgetRepos = $this->mock(BudgetRepositoryInterface::class); + $budgetRepos->shouldReceive('getBudgets')->andReturn(new Collection); + $transfers = TransactionJournal::where('transaction_type_id', 3)->where('user_id', $this->user()->id)->take(2)->get()->pluck('id')->toArray(); $this->be($this->user()); From bf138670e85d5ab9c4ece7010edea4c10198e900 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 9 Mar 2017 08:20:49 +0100 Subject: [PATCH 014/151] New translations firefly.php (Dutch) --- resources/lang/nl_NL/firefly.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php index dcf794bdea..bdf2483bcb 100644 --- a/resources/lang/nl_NL/firefly.php +++ b/resources/lang/nl_NL/firefly.php @@ -854,7 +854,7 @@ return [ 'tag_title_nothing' => 'Standaard tags', 'tag_title_balancingAct' => 'Balancerende tags', 'tag_title_advancePayment' => 'Vooruitbetaalde tags', - 'tags_introduction' => 'Usually tags are singular words, designed to quickly band items together using things like expensive, bill or for-party. In Firefly III, tags can have more properties such as a date, description and location. This allows you to join transactions together in a more meaningful way. For example, you could make a tag called Christmas dinner with friends and add information about the restaurant. Such tags are "singular", you would only use them for a single occasion, perhaps with multiple transactions.', + 'tags_introduction' => 'Normaal gesproken zijn tags enkele woorden, gebruikt om gerelateerde zaken snel aan elkaar te plakken. dure-aanschaf, rekening, feestje. In Firefly III hebben tags meer betekenis en kan je er een datum, omschrijving en locatie aan geven. Daarmee kan je je transacties op een wat zinvollere manier aan elkaar koppelen. Je kan bijvoorbeeld een tag Kerstdiner maken en informatie over het restaurant meenemen. Zulke tags zijn enkelvoudig; je gebruikt ze maar bij één gelegenheid.', 'tags_group' => 'Omdat tags transacties groeperen kan je er teruggaves, vergoedingen en andere geldzaken mee aanduiden, zolang de transacties elkaar "opheffen". Hoe je dit aanpakt is aan jou. De gewone manier kan natuurlijk ook.', 'tags_start' => 'Maak hieronder een tag, of voer nieuwe tags in als je nieuwe transacties maakt.', From 61007a95a601d4599c069afad26816d1225bc805 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 9 Mar 2017 20:54:18 +0100 Subject: [PATCH 015/151] Initial code for #595, transactions with no budget --- app/Http/Controllers/BudgetController.php | 118 ++++++++++++++++++---- resources/views/budgets/no-budget.twig | 58 ++++++++++- routes/web.php | 2 +- 3 files changed, 158 insertions(+), 20 deletions(-) diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index a9ac2a2749..6802b9b235 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -24,9 +24,12 @@ use FireflyIII\Models\Budget; use FireflyIII\Models\BudgetLimit; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Support\CacheProperties; use Illuminate\Http\Request; use Illuminate\Support\Collection; +use Log; +use Navigation; use Preferences; use Response; use View; @@ -191,27 +194,66 @@ class BudgetController extends Controller * * @return View */ - public function noBudget(Request $request) + public function noBudget(Request $request, string $moment = '') { - /** @var Carbon $start */ - $start = session('start', Carbon::now()->startOfMonth()); - /** @var Carbon $end */ - $end = session('end', Carbon::now()->endOfMonth()); + // default values: + $range = Preferences::get('viewRange', '1M')->data; + $start = null; + $end = null; + $periods = new Collection; + + // prep for "all" view. + if ($moment === 'all') { + $subTitle = trans('firefly.all_journals_without_budget'); + } + + // prep for "specific date" view. + if (strlen($moment) > 0 && $moment !== 'all') { + $start = new Carbon($moment); + $end = Navigation::endOfPeriod($start, $range); + $subTitle = trans( + 'firefly.without_budget_between', + ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] + ); + $periods = $this->noBudgetPeriodEntries(); + } + + // prep for current period + if (strlen($moment) === 0) { + $start = clone session('start', Navigation::startOfPeriod(new Carbon, $range)); + $end = clone session('end', Navigation::endOfPeriod(new Carbon, $range)); + $periods = $this->noBudgetPeriodEntries(); + $subTitle = trans( + 'firefly.without_budget_between', + ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] + ); + } + $page = intval($request->get('page')) == 0 ? 1 : intval($request->get('page')); $pageSize = intval(Preferences::get('transactionPageSize', 50)->data); - $subTitle = trans( - 'firefly.without_budget_between', - ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] - ); - // collector - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withoutBudget(); - $journals = $collector->getPaginatedJournals(); - $journals->setPath('/budgets/list/noBudget'); + $count = 0; + $loop = 0; + // grab journals, but be prepared to jump a period back to get the right ones: + Log::info('Now at no-budget loop start.'); + while ($count === 0 && $loop < 3) { + $loop++; + Log::info('Count is zero, search for journals.'); + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withoutBudget(); + $journals = $collector->getPaginatedJournals(); + $journals->setPath('/budgets/list/no-budget'); + $count = $journals->getCollection()->count(); + if ($count === 0) { + $start->subDay(); + $start = Navigation::startOfPeriod($start, $range); + $end = Navigation::endOfPeriod($start, $range); + Log::info(sprintf('Count is still zero, go back in time to "%s" and "%s"!', $start->format('Y-m-d'), $end->format('Y-m-d'))); + } + } - return view('budgets.no-budget', compact('journals', 'subTitle')); + return view('budgets.no-budget', compact('journals', 'subTitle', 'periods', 'start', 'end')); } /** @@ -405,7 +447,6 @@ class BudgetController extends Controller return $return; } - /** * @param Budget $budget * @param Carbon $start @@ -442,4 +483,47 @@ class BudgetController extends Controller return $set; } + /** + * @return Collection + */ + private function noBudgetPeriodEntries(): Collection + { + $repository = app(JournalRepositoryInterface::class); + $first = $repository->first(); + $start = $first->date ?? new Carbon; + $range = Preferences::get('viewRange', '1M')->data; + $start = Navigation::startOfPeriod($start, $range); + $end = Navigation::endOfX(new Carbon, $range); + $entries = new Collection; + + // properties for cache + $cache = new CacheProperties; + $cache->addProperty($start); + $cache->addProperty($end); + $cache->addProperty('no-budget-period-entries'); + + if ($cache->has()) { + return $cache->get(); // @codeCoverageIgnore + } + + Log::debug('Going to get period expenses and incomes.'); + while ($end >= $start) { + $end = Navigation::startOfPeriod($end, $range); + $currentEnd = Navigation::endOfPeriod($end, $range); + + // count journals without budget in this period: + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setAllAssetAccounts()->setRange($end, $currentEnd)->withoutBudget(); + $journals = $collector->getJournals()->count(); + $dateStr = $end->format('Y-m-d'); + $dateName = Navigation::periodShow($end, $range); + $entries->push([$dateStr, $dateName, $journals, clone $end]); + $end = Navigation::subtractPeriod($end, $range, 1); + } + $cache->store($entries); + + return $entries; + } + } diff --git a/resources/views/budgets/no-budget.twig b/resources/views/budgets/no-budget.twig index e8e1f0809b..83ef89391e 100644 --- a/resources/views/budgets/no-budget.twig +++ b/resources/views/budgets/no-budget.twig @@ -5,19 +5,73 @@ {% endblock %} {% block content %} + + {# upper show-all instruction #} + {% if periods.count > 0 %} +
+
+

{{ 'showEverything'|_ }}

+
+
+ {% endif %} +
-
+

{{ subTitle }}

-
+
{% include 'list.journals-tasker' with {'journals': journals} %} + {% if periods.count > 0 %} +

+ + {{ 'show_all_no_filter'|_ }} +

+ {% else %} +

+ + {{ 'show_the_current_period_and_overview'|_ }} +

+ {% endif %}
+ + {% if periods.count > 0 %} +
+ {% for entry in periods %} + {% if entry[2] > 0 %} +
+
+

{{ entry[1] }} +

+
+
+ + + + + +
{{ 'transactions'|_ }}{{ entry[2] }}
+
+
+ {% endif %} + {% endfor %} +
+ {% endif %} +
+ {# lower show-all instruction #} + {% if periods.count > 0 %} +
+
+

{{ 'showEverything'|_ }}

+
+
+ {% endif %} + {% endblock %} {% block scripts %} diff --git a/routes/web.php b/routes/web.php index 201351db87..36571253d9 100755 --- a/routes/web.php +++ b/routes/web.php @@ -144,7 +144,7 @@ Route::group( Route::get('delete/{budget}', ['uses' => 'BudgetController@delete', 'as' => 'delete']); Route::get('show/{budget}', ['uses' => 'BudgetController@show', 'as' => 'show']); Route::get('show/{budget}/{budgetlimit}', ['uses' => 'BudgetController@showByBudgetLimit', 'as' => 'show.limit']); - Route::get('list/no-budget', ['uses' => 'BudgetController@noBudget', 'as' => 'no-budget']); + Route::get('list/no-budget/{moment?}', ['uses' => 'BudgetController@noBudget', 'as' => 'no-budget']); Route::post('income', ['uses' => 'BudgetController@postUpdateIncome', 'as' => 'income.post']); Route::post('store', ['uses' => 'BudgetController@store', 'as' => 'store']); From db6e6dfe4a3417453670df1ae3fead13035f0464 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 9 Mar 2017 21:05:37 +0100 Subject: [PATCH 016/151] Fix tests for #595 --- app/Http/Controllers/BudgetController.php | 6 +- resources/lang/en_US/firefly.php | 1 + .../Controllers/BudgetControllerTest.php | 71 ++++++++++++++++++- 3 files changed, 76 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index 6802b9b235..6437e97a33 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -191,10 +191,11 @@ class BudgetController extends Controller /** * @param Request $request + * @param string $moment * * @return View */ - public function noBudget(Request $request, string $moment = '') + public function noBudget(Request $request, JournalRepositoryInterface $repository, string $moment = '') { // default values: $range = Preferences::get('viewRange', '1M')->data; @@ -205,6 +206,9 @@ class BudgetController extends Controller // prep for "all" view. if ($moment === 'all') { $subTitle = trans('firefly.all_journals_without_budget'); + $first = $repository->first(); + $start = $first->date ?? new Carbon; + $end = new Carbon; } // prep for "specific date" view. diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index b6aceb646d..c33e58cfd8 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -115,6 +115,7 @@ return [ 'multi_select_no_selection' => 'None selected', 'multi_select_all_selected' => 'All selected', 'multi_select_filter_placeholder' => 'Find..', + 'all_journals_without_budget' => 'All transactions without a budget', // repeat frequencies: diff --git a/tests/Feature/Controllers/BudgetControllerTest.php b/tests/Feature/Controllers/BudgetControllerTest.php index d6d0882781..fca3c8dc29 100644 --- a/tests/Feature/Controllers/BudgetControllerTest.php +++ b/tests/Feature/Controllers/BudgetControllerTest.php @@ -142,6 +142,7 @@ class BudgetControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\BudgetController::noBudget + * @covers \FireflyIII\Http\Controllers\BudgetController::noBudgetPeriodEntries * @dataProvider dateRangeProvider * * @param string $range @@ -151,10 +152,11 @@ class BudgetControllerTest extends TestCase // mock stuff $collector = $this->mock(JournalCollectorInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); + $journalRepos->shouldReceive('first')->andReturn(new TransactionJournal); $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); $collector->shouldReceive('setRange')->andReturnSelf(); + $collector->shouldReceive('getJournals')->andReturn(new Collection); $collector->shouldReceive('setLimit')->andReturnSelf(); $collector->shouldReceive('setPage')->andReturnSelf(); $collector->shouldReceive('withoutBudget')->andReturnSelf(); @@ -172,6 +174,73 @@ class BudgetControllerTest extends TestCase $response->assertSee('
    '); } + /** + * @covers \FireflyIII\Http\Controllers\BudgetController::noBudget + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testNoBudgetAll(string $range) + { + // mock stuff + $collector = $this->mock(JournalCollectorInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('first')->andReturn(new TransactionJournal); + + $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); + $collector->shouldReceive('setRange')->andReturnSelf(); + $collector->shouldReceive('setLimit')->andReturnSelf(); + $collector->shouldReceive('setPage')->andReturnSelf(); + $collector->shouldReceive('withoutBudget')->andReturnSelf(); + $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); + $collector->shouldReceive('getJournals')->andReturn(new Collection); + $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); + + $date = new Carbon(); + $this->session(['start' => $date, 'end' => clone $date]); + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('budgets.no-budget', ['all'])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
      '); + } + + /** + * @covers \FireflyIII\Http\Controllers\BudgetController::noBudget + * @covers \FireflyIII\Http\Controllers\BudgetController::noBudgetPeriodEntries + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testNoBudgetDate(string $range) + { + // mock stuff + $collector = $this->mock(JournalCollectorInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('first')->andReturn(new TransactionJournal); + + $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); + $collector->shouldReceive('setRange')->andReturnSelf(); + $collector->shouldReceive('getJournals')->andReturn(new Collection); + $collector->shouldReceive('setLimit')->andReturnSelf(); + $collector->shouldReceive('setPage')->andReturnSelf(); + $collector->shouldReceive('withoutBudget')->andReturnSelf(); + $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); + $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); + + $date = new Carbon(); + $this->session(['start' => $date, 'end' => clone $date]); + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('budgets.no-budget', ['2016-01-01'])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
        '); + } + /** * @covers \FireflyIII\Http\Controllers\BudgetController::postUpdateIncome */ From 8d172801b5ea8ead3bb469017e25cf1811909bdd Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 9 Mar 2017 21:10:24 +0100 Subject: [PATCH 017/151] New translations firefly.php (Portuguese, Brazilian) --- resources/lang/pt_BR/firefly.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php index 55bc416748..8d95062fee 100644 --- a/resources/lang/pt_BR/firefly.php +++ b/resources/lang/pt_BR/firefly.php @@ -115,6 +115,7 @@ return [ 'multi_select_no_selection' => 'None selected', 'multi_select_all_selected' => 'All selected', 'multi_select_filter_placeholder' => 'Find..', + 'all_journals_without_budget' => 'All transactions without a budget', // repeat frequencies: From f4867d1d09ba4bbbb83370affb0c803bbb7a9d62 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 9 Mar 2017 21:10:29 +0100 Subject: [PATCH 018/151] New translations firefly.php (Polish) --- resources/lang/pl_PL/firefly.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php index b4bc54902f..29ec1eadba 100644 --- a/resources/lang/pl_PL/firefly.php +++ b/resources/lang/pl_PL/firefly.php @@ -115,6 +115,7 @@ return [ 'multi_select_no_selection' => 'Nie wybrano', 'multi_select_all_selected' => 'Wybrano wszystko', 'multi_select_filter_placeholder' => 'Find..', + 'all_journals_without_budget' => 'All transactions without a budget', // repeat frequencies: From 8dc2faa5e5ad2ee8e98c0b56e0b49817c03ad050 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 9 Mar 2017 21:10:34 +0100 Subject: [PATCH 019/151] New translations firefly.php (German) --- resources/lang/de_DE/firefly.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php index 4ab31f014a..f214284ccf 100644 --- a/resources/lang/de_DE/firefly.php +++ b/resources/lang/de_DE/firefly.php @@ -115,6 +115,7 @@ return [ 'multi_select_no_selection' => 'Nichts ausgewählt', 'multi_select_all_selected' => 'Alle ausgewählt', 'multi_select_filter_placeholder' => 'Suche..', + 'all_journals_without_budget' => 'All transactions without a budget', // repeat frequencies: From 44bea623832e7a1afb73e9dd8d7b6b64a7728cb7 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 9 Mar 2017 21:10:45 +0100 Subject: [PATCH 020/151] New translations firefly.php (Spanish) --- resources/lang/es_ES/firefly.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php index 35529bd959..69ba02571a 100644 --- a/resources/lang/es_ES/firefly.php +++ b/resources/lang/es_ES/firefly.php @@ -115,6 +115,7 @@ return [ 'multi_select_no_selection' => 'None selected', 'multi_select_all_selected' => 'All selected', 'multi_select_filter_placeholder' => 'Find..', + 'all_journals_without_budget' => 'All transactions without a budget', // repeat frequencies: From ca8684146c2ca1b97239be8671b33ec1300675c0 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 9 Mar 2017 21:10:51 +0100 Subject: [PATCH 021/151] New translations firefly.php (Dutch) --- resources/lang/nl_NL/firefly.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php index bdf2483bcb..34ebfe193f 100644 --- a/resources/lang/nl_NL/firefly.php +++ b/resources/lang/nl_NL/firefly.php @@ -115,6 +115,7 @@ return [ 'multi_select_no_selection' => 'Niets geselecteerd', 'multi_select_all_selected' => 'Alles geselecteerd', 'multi_select_filter_placeholder' => 'Vinden..', + 'all_journals_without_budget' => 'All transactions without a budget', // repeat frequencies: From ff43a547a6896fe22811b88f14d03cfc551c42db Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 9 Mar 2017 21:10:57 +0100 Subject: [PATCH 022/151] New translations firefly.php (Russian) --- resources/lang/ru_RU/firefly.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/ru_RU/firefly.php b/resources/lang/ru_RU/firefly.php index 35529bd959..69ba02571a 100644 --- a/resources/lang/ru_RU/firefly.php +++ b/resources/lang/ru_RU/firefly.php @@ -115,6 +115,7 @@ return [ 'multi_select_no_selection' => 'None selected', 'multi_select_all_selected' => 'All selected', 'multi_select_filter_placeholder' => 'Find..', + 'all_journals_without_budget' => 'All transactions without a budget', // repeat frequencies: From 1125fcd6c5974fbf9f163c968c6334cb29dd7537 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 9 Mar 2017 21:11:11 +0100 Subject: [PATCH 023/151] New translations firefly.php (Chinese Traditional, Hong Kong) --- resources/lang/zh_HK/firefly.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/zh_HK/firefly.php b/resources/lang/zh_HK/firefly.php index 35529bd959..69ba02571a 100644 --- a/resources/lang/zh_HK/firefly.php +++ b/resources/lang/zh_HK/firefly.php @@ -115,6 +115,7 @@ return [ 'multi_select_no_selection' => 'None selected', 'multi_select_all_selected' => 'All selected', 'multi_select_filter_placeholder' => 'Find..', + 'all_journals_without_budget' => 'All transactions without a budget', // repeat frequencies: From bec5d93af6134f245ce85d71ddd3fefa0ca1cac9 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 9 Mar 2017 21:11:18 +0100 Subject: [PATCH 024/151] New translations firefly.php (Croatian) --- resources/lang/hr_HR/firefly.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/hr_HR/firefly.php b/resources/lang/hr_HR/firefly.php index 35529bd959..69ba02571a 100644 --- a/resources/lang/hr_HR/firefly.php +++ b/resources/lang/hr_HR/firefly.php @@ -115,6 +115,7 @@ return [ 'multi_select_no_selection' => 'None selected', 'multi_select_all_selected' => 'All selected', 'multi_select_filter_placeholder' => 'Find..', + 'all_journals_without_budget' => 'All transactions without a budget', // repeat frequencies: From 6508b4058f522da6e0e9cd5c944da0a832c4a926 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 9 Mar 2017 21:11:25 +0100 Subject: [PATCH 025/151] New translations firefly.php (Chinese Traditional) --- resources/lang/zh_TW/firefly.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php index 4f58590d02..8303963a8e 100644 --- a/resources/lang/zh_TW/firefly.php +++ b/resources/lang/zh_TW/firefly.php @@ -115,6 +115,7 @@ return [ 'multi_select_no_selection' => 'None selected', 'multi_select_all_selected' => 'All selected', 'multi_select_filter_placeholder' => 'Find..', + 'all_journals_without_budget' => 'All transactions without a budget', // repeat frequencies: From 89f7e1ba2abcf47a415f1e2b0aa21afb5e5391c8 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 9 Mar 2017 21:11:36 +0100 Subject: [PATCH 026/151] New translations firefly.php (French) --- resources/lang/fr_FR/firefly.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php index 88fc43f9cb..82d68bd3b6 100644 --- a/resources/lang/fr_FR/firefly.php +++ b/resources/lang/fr_FR/firefly.php @@ -115,6 +115,7 @@ return [ 'multi_select_no_selection' => 'None selected', 'multi_select_all_selected' => 'All selected', 'multi_select_filter_placeholder' => 'Find..', + 'all_journals_without_budget' => 'All transactions without a budget', // repeat frequencies: From a8fdfdd5e0f99890f86395c335e7454496786951 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 10 Mar 2017 15:27:19 +0100 Subject: [PATCH 027/151] Add opposing account info [skip ci] #595 --- app/Http/Controllers/BudgetController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index 6437e97a33..ce36ee0e4c 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -245,7 +245,7 @@ class BudgetController extends Controller Log::info('Count is zero, search for journals.'); /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withoutBudget(); + $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withoutBudget()->withOpposingAccount(); $journals = $collector->getPaginatedJournals(); $journals->setPath('/budgets/list/no-budget'); $count = $journals->getCollection()->count(); From ef0057d88dd57c9c0597ebd8ff0a8a170c2d869b Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 10 Mar 2017 15:28:04 +0100 Subject: [PATCH 028/151] Add opposing account info [skip ci] #595 --- app/Http/Controllers/BudgetController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index ce36ee0e4c..f758a9bdc3 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -518,7 +518,7 @@ class BudgetController extends Controller // count journals without budget in this period: /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setAllAssetAccounts()->setRange($end, $currentEnd)->withoutBudget(); + $collector->setAllAssetAccounts()->setRange($end, $currentEnd)->withoutBudget()->withOpposingAccount(); $journals = $collector->getJournals()->count(); $dateStr = $end->format('Y-m-d'); $dateName = Navigation::periodShow($end, $range); From ebc712f6b5f0f501c24529025c285ffe8815a290 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 10 Mar 2017 16:08:58 +0100 Subject: [PATCH 029/151] Consistency for #595 --- app/Http/Controllers/AccountController.php | 48 ++++++++++------ app/Http/Controllers/BudgetController.php | 12 ++-- app/Http/breadcrumbs.php | 64 ++++++++++++---------- resources/lang/en_US/firefly.php | 3 + resources/views/accounts/show.twig | 18 +++--- resources/views/budgets/no-budget.twig | 30 +++++----- routes/web.php | 3 +- 7 files changed, 100 insertions(+), 78 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 520d3b8516..2e0758a4cf 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -25,6 +25,7 @@ use FireflyIII\Models\Transaction; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Account\AccountTaskerInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Support\CacheProperties; use Illuminate\Http\Request; use Illuminate\Support\Collection; @@ -229,16 +230,18 @@ class AccountController extends Controller /** - * @param Request $request - * @param Account $account - * @param string $moment + * @param Request $request + * @param JournalRepositoryInterface $repository + * @param Account $account + * @param string $moment + * + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View */ - public function show(Request $request, Account $account, string $moment = '') + public function show(Request $request, JournalRepositoryInterface $repository, Account $account, string $moment = '') { if ($account->accountType->type === AccountType::INITIAL_BALANCE) { return $this->redirectToOriginalAccount($account); } - $subTitle = $account->name; $range = Preferences::get('viewRange', '1M')->data; $subTitleIcon = config('firefly.subIconsByIdentifier.' . $account->accountType->type); $page = intval($request->get('page')) === 0 ? 1 : intval($request->get('page')); @@ -250,29 +253,34 @@ class AccountController extends Controller // prep for "all" view. if ($moment === 'all') { - $subTitle = $account->name . ' (' . strtolower(strval(trans('firefly.everything'))) . ')'; + $subTitle = trans('firefly.all_journals_for_account', ['name' => $account->name]); $chartUri = route('chart.account.all', [$account->id]); + $first = $repository->first(); + $start = $first->date ?? new Carbon; + $end = new Carbon; } // prep for "specific date" view. if (strlen($moment) > 0 && $moment !== 'all') { $start = new Carbon($moment); $end = Navigation::endOfPeriod($start, $range); - $subTitle = $account->name . ' (' . strval( - trans( - 'firefly.from_to_breadcrumb', - ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] - ) - ) . ')'; + $subTitle = trans( + 'firefly.journals_in_period_for_account', ['name' => $account->name, 'start' => $start->formatLocalized($this->monthAndDayFormat), + 'end' => $end->formatLocalized($this->monthAndDayFormat)] + ); $chartUri = route('chart.account.period', [$account->id, $start->format('Y-m-d')]); $periods = $this->periodEntries($account); } // prep for current period if (strlen($moment) === 0) { - $start = clone session('start', Navigation::startOfPeriod(new Carbon, $range)); - $end = clone session('end', Navigation::endOfPeriod(new Carbon, $range)); - $periods = $this->periodEntries($account); + $start = clone session('start', Navigation::startOfPeriod(new Carbon, $range)); + $end = clone session('end', Navigation::endOfPeriod(new Carbon, $range)); + $subTitle = trans( + 'firefly.journals_in_period_for_account', ['name' => $account->name, 'start' => $start->formatLocalized($this->monthAndDayFormat), + 'end' => $end->formatLocalized($this->monthAndDayFormat)] + ); + $periods = $this->periodEntries($account); } $accountType = $account->accountType->type; @@ -299,8 +307,16 @@ class AccountController extends Controller } } + // fix title: + if ((strlen($moment) > 0 && $moment !== 'all') || strlen($moment) === 0) { + $subTitle = trans( + 'firefly.journals_in_period_for_account', ['name' => $account->name, 'start' => $start->formatLocalized($this->monthAndDayFormat), + 'end' => $end->formatLocalized($this->monthAndDayFormat)] + ); + } - return view('accounts.show', compact('account', 'accountType', 'periods', 'subTitleIcon', 'journals', 'subTitle', 'start', 'end', 'chartUri')); + + return view('accounts.show', compact('account','moment', 'accountType', 'periods', 'subTitleIcon', 'journals', 'subTitle', 'start', 'end', 'chartUri')); } /** diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index f758a9bdc3..9d79bfd7cf 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -215,10 +215,7 @@ class BudgetController extends Controller if (strlen($moment) > 0 && $moment !== 'all') { $start = new Carbon($moment); $end = Navigation::endOfPeriod($start, $range); - $subTitle = trans( - 'firefly.without_budget_between', - ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] - ); + $subTitle = trans('firefly.without_budget_between', ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]); $periods = $this->noBudgetPeriodEntries(); } @@ -257,7 +254,12 @@ class BudgetController extends Controller } } - return view('budgets.no-budget', compact('journals', 'subTitle', 'periods', 'start', 'end')); + // fix title: + if ((strlen($moment) > 0 && $moment !== 'all') || strlen($moment) === 0) { + $subTitle = trans('firefly.without_budget_between', ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]); + } + + return view('budgets.no-budget', compact('journals', 'subTitle', 'moment', 'periods', 'start', 'end')); } /** diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php index c39ad146e1..1d79655dd1 100644 --- a/app/Http/breadcrumbs.php +++ b/app/Http/breadcrumbs.php @@ -67,32 +67,25 @@ Breadcrumbs::register( ); Breadcrumbs::register( - 'accounts.show', function (BreadCrumbGenerator $breadcrumbs, Account $account) { + 'accounts.show', function (BreadCrumbGenerator $breadcrumbs, Account $account, string $moment, Carbon $start, Carbon $end) { $what = config('firefly.shortNamesByFullName.' . $account->accountType->type); $breadcrumbs->parent('accounts.index', $what); $breadcrumbs->push($account->name, route('accounts.show', [$account->id])); -} -); -Breadcrumbs::register( - 'accounts.show.date', function (BreadCrumbGenerator $breadcrumbs, Account $account, Carbon $start = null, Carbon $end = null) { - - $title = ''; - $route = ''; - if (!is_null($start) && !is_null($end)) { - $startString = $start->formatLocalized(strval(trans('config.month_and_day'))); - $endString = $end->formatLocalized(strval(trans('config.month_and_day'))); - $title = sprintf('%s (%s)', $account->name, trans('firefly.from_to_breadcrumb', ['start' => $startString, 'end' => $endString])); - $route = route('accounts.show.date', [$account->id, $start->format('Y-m-d')]); + // push when is all: + if ($moment === 'all') { + $breadcrumbs->push(trans('firefly.all_journals_for_account', ['name' => $account->name]), route('accounts.show', [$account->id])); } - if (is_null($start) && is_null($end)) { - $title = $title = $account->name . ' (' . strtolower(strval(trans('firefly.everything'))) . ')'; - $route = route('accounts.show.date', [$account->id, 'all']); + // when is specific period: + if (strlen($moment) > 0 && $moment !== 'all') { + $title = trans('firefly.journals_in_period_for_account', ['name' => $account->name, + 'start' => $start->formatLocalized(strval(trans('config.month_and_day'))), + 'end' => $end->formatLocalized(strval(trans('config.month_and_day')))] + ); + $breadcrumbs->push($title, route('accounts.show', [$account->id, $moment])); } - $breadcrumbs->parent('accounts.show', $account); - $breadcrumbs->push($title, $route); } ); @@ -256,9 +249,23 @@ Breadcrumbs::register( ); Breadcrumbs::register( - 'budgets.no-budget', function (BreadCrumbGenerator $breadcrumbs, $subTitle) { + 'budgets.no-budget', function (BreadCrumbGenerator $breadcrumbs, string $moment, Carbon $start, Carbon $end) { $breadcrumbs->parent('budgets.index'); - $breadcrumbs->push($subTitle, route('budgets.no-budget')); + $breadcrumbs->push(trans('firefly.journals_without_budget'), route('budgets.no-budget')); + + // push when is all: + if ($moment === 'all') { + $breadcrumbs->push(trans('firefly.all_journals_without_budget'), route('budgets.no-budget', ['all'])); + } + // when is specific period: + if (strlen($moment) > 0 && $moment !== 'all') { + $title = trans('firefly.without_budget_between', ['start' => $start->formatLocalized(strval(trans('config.month_and_day'))), + 'end' => $end->formatLocalized(strval(trans('config.month_and_day')))] + ); + $breadcrumbs->push($title, route('budgets.no-budget', [$moment])); + } + + } ); @@ -792,15 +799,16 @@ Breadcrumbs::register( Breadcrumbs::register( 'transactions.mass.edit', function (BreadCrumbGenerator $breadcrumbs, Collection $journals) { - if($journals->count() > 0) { - $journalIds = $journals->pluck('id')->toArray(); - $what = strtolower($journals->first()->transactionType->type); - $breadcrumbs->parent('transactions.index', $what); - $breadcrumbs->push(trans('firefly.mass_edit_journals'), route('transactions.mass.edit', $journalIds)); - return; - } + if ($journals->count() > 0) { + $journalIds = $journals->pluck('id')->toArray(); + $what = strtolower($journals->first()->transactionType->type); + $breadcrumbs->parent('transactions.index', $what); + $breadcrumbs->push(trans('firefly.mass_edit_journals'), route('transactions.mass.edit', $journalIds)); - $breadcrumbs->parent('index'); + return; + } + + $breadcrumbs->parent('index'); } ); diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index c33e58cfd8..cbf0516c67 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -116,6 +116,9 @@ return [ 'multi_select_all_selected' => 'All selected', 'multi_select_filter_placeholder' => 'Find..', 'all_journals_without_budget' => 'All transactions without a budget', + 'journals_without_budget' => 'Transactions without a budget', + 'all_journals_for_account' => 'All transactions for account :name', + 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', // repeat frequencies: diff --git a/resources/views/accounts/show.twig b/resources/views/accounts/show.twig index 395e71767b..b4fe840ed1 100644 --- a/resources/views/accounts/show.twig +++ b/resources/views/accounts/show.twig @@ -1,7 +1,7 @@ {% extends "./layout/default" %} {% block breadcrumbs %} - {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, account, start, end) }} + {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, account, moment, start, end) }} {% endblock %} {% block content %} @@ -9,12 +9,8 @@
        -

        {{ account.name }} - {% if start and end %} - ({{ trans('firefly.from_to_breadcrumb', {start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }}) - {% else %} - ({{ trans('firefly.everything')|lower }}) - {% endif %} +

        + {{ subTitle }}

        @@ -74,7 +70,7 @@ {% if periods.count > 0 %}
        -

        {{ 'showEverything'|_ }}

        +

        {{ 'showEverything'|_ }}

        {% endif %} @@ -90,7 +86,7 @@ {% if periods.count > 0 %}

        - + {{ 'show_all_no_filter'|_ }}

        @@ -111,7 +107,7 @@ {% if (entry[2] != 0 or entry[3] != 0) or (accountType == 'Asset account') %}
        -

        {{ entry[1] }} +

        {{ entry[1] }}

        @@ -133,7 +129,7 @@
        {% endif %} {% endfor %} -

        {{ 'showEverything'|_ }}

        +

        {{ 'showEverything'|_ }}

        {% endif %}
        diff --git a/resources/views/budgets/no-budget.twig b/resources/views/budgets/no-budget.twig index 83ef89391e..20166e601d 100644 --- a/resources/views/budgets/no-budget.twig +++ b/resources/views/budgets/no-budget.twig @@ -1,7 +1,7 @@ {% extends "./layout/default" %} {% block breadcrumbs %} - {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, subTitle) }} + {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, moment, start, end) }} {% endblock %} {% block content %} @@ -41,22 +41,20 @@ {% if periods.count > 0 %}
        {% for entry in periods %} - {% if entry[2] > 0 %} -
        -
        -

        {{ entry[1] }} -

        -
        -
        - - - - - -
        {{ 'transactions'|_ }}{{ entry[2] }}
        -
        +
        +
        +

        {{ entry[1] }} +

        - {% endif %} +
        + + + + + +
        {{ 'transactions'|_ }}{{ entry[2] }}
        +
        +
        {% endfor %}
        {% endif %} diff --git a/routes/web.php b/routes/web.php index 36571253d9..2d94859db5 100755 --- a/routes/web.php +++ b/routes/web.php @@ -87,8 +87,7 @@ Route::group( Route::get('edit/{account}', ['uses' => 'AccountController@edit', 'as' => 'edit']); Route::get('delete/{account}', ['uses' => 'AccountController@delete', 'as' => 'delete']); - Route::get('show/{account}', ['uses' => 'AccountController@show', 'as' => 'show']); - Route::get('show/{account}/{date}', ['uses' => 'AccountController@show', 'as' => 'show.date']); + Route::get('show/{account}/{moment?}', ['uses' => 'AccountController@show', 'as' => 'show']); Route::post('store', ['uses' => 'AccountController@store', 'as' => 'store']); Route::post('update/{account}', ['uses' => 'AccountController@update', 'as' => 'update']); From c18f19db9706d7fa2b79b78288ad87a84092010f Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 10 Mar 2017 16:10:40 +0100 Subject: [PATCH 030/151] New translations firefly.php (Portuguese, Brazilian) --- resources/lang/pt_BR/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php index 8d95062fee..e500d2bfbc 100644 --- a/resources/lang/pt_BR/firefly.php +++ b/resources/lang/pt_BR/firefly.php @@ -116,6 +116,9 @@ return [ 'multi_select_all_selected' => 'All selected', 'multi_select_filter_placeholder' => 'Find..', 'all_journals_without_budget' => 'All transactions without a budget', + 'journals_without_budget' => 'Transactions without a budget', + 'all_journals_for_account' => 'All transactions for account :name', + 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', // repeat frequencies: From a1c4fb73cda7b02de2ee98b69944050a321528f7 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 10 Mar 2017 16:10:46 +0100 Subject: [PATCH 031/151] New translations firefly.php (Polish) --- resources/lang/pl_PL/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php index 29ec1eadba..2c13e89d60 100644 --- a/resources/lang/pl_PL/firefly.php +++ b/resources/lang/pl_PL/firefly.php @@ -116,6 +116,9 @@ return [ 'multi_select_all_selected' => 'Wybrano wszystko', 'multi_select_filter_placeholder' => 'Find..', 'all_journals_without_budget' => 'All transactions without a budget', + 'journals_without_budget' => 'Transactions without a budget', + 'all_journals_for_account' => 'All transactions for account :name', + 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', // repeat frequencies: From fc42a621e47bdb50eebdacec184eed4cc7c73a72 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 10 Mar 2017 16:10:55 +0100 Subject: [PATCH 032/151] New translations firefly.php (German) --- resources/lang/de_DE/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php index f214284ccf..da46651515 100644 --- a/resources/lang/de_DE/firefly.php +++ b/resources/lang/de_DE/firefly.php @@ -116,6 +116,9 @@ return [ 'multi_select_all_selected' => 'Alle ausgewählt', 'multi_select_filter_placeholder' => 'Suche..', 'all_journals_without_budget' => 'All transactions without a budget', + 'journals_without_budget' => 'Transactions without a budget', + 'all_journals_for_account' => 'All transactions for account :name', + 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', // repeat frequencies: From b2904e09d884fd6f0cecdbeecddc323c96cbdbf7 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 10 Mar 2017 16:11:11 +0100 Subject: [PATCH 033/151] New translations firefly.php (Spanish) --- resources/lang/es_ES/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php index 69ba02571a..a066c1db19 100644 --- a/resources/lang/es_ES/firefly.php +++ b/resources/lang/es_ES/firefly.php @@ -116,6 +116,9 @@ return [ 'multi_select_all_selected' => 'All selected', 'multi_select_filter_placeholder' => 'Find..', 'all_journals_without_budget' => 'All transactions without a budget', + 'journals_without_budget' => 'Transactions without a budget', + 'all_journals_for_account' => 'All transactions for account :name', + 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', // repeat frequencies: From 84a3e68eb5e1a5ce02e982382aa857b2a5438316 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 10 Mar 2017 16:11:18 +0100 Subject: [PATCH 034/151] New translations firefly.php (Dutch) --- resources/lang/nl_NL/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php index 34ebfe193f..bded46293a 100644 --- a/resources/lang/nl_NL/firefly.php +++ b/resources/lang/nl_NL/firefly.php @@ -116,6 +116,9 @@ return [ 'multi_select_all_selected' => 'Alles geselecteerd', 'multi_select_filter_placeholder' => 'Vinden..', 'all_journals_without_budget' => 'All transactions without a budget', + 'journals_without_budget' => 'Transactions without a budget', + 'all_journals_for_account' => 'All transactions for account :name', + 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', // repeat frequencies: From 51df78ad2de8adf3db4b73468601be54261dcfa2 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 10 Mar 2017 16:11:27 +0100 Subject: [PATCH 035/151] New translations firefly.php (Russian) --- resources/lang/ru_RU/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/ru_RU/firefly.php b/resources/lang/ru_RU/firefly.php index 69ba02571a..a066c1db19 100644 --- a/resources/lang/ru_RU/firefly.php +++ b/resources/lang/ru_RU/firefly.php @@ -116,6 +116,9 @@ return [ 'multi_select_all_selected' => 'All selected', 'multi_select_filter_placeholder' => 'Find..', 'all_journals_without_budget' => 'All transactions without a budget', + 'journals_without_budget' => 'Transactions without a budget', + 'all_journals_for_account' => 'All transactions for account :name', + 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', // repeat frequencies: From 1af6fd5d74b3aeed2a04be8871068b5409075757 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 10 Mar 2017 16:11:42 +0100 Subject: [PATCH 036/151] New translations firefly.php (Chinese Traditional, Hong Kong) --- resources/lang/zh_HK/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/zh_HK/firefly.php b/resources/lang/zh_HK/firefly.php index 69ba02571a..a066c1db19 100644 --- a/resources/lang/zh_HK/firefly.php +++ b/resources/lang/zh_HK/firefly.php @@ -116,6 +116,9 @@ return [ 'multi_select_all_selected' => 'All selected', 'multi_select_filter_placeholder' => 'Find..', 'all_journals_without_budget' => 'All transactions without a budget', + 'journals_without_budget' => 'Transactions without a budget', + 'all_journals_for_account' => 'All transactions for account :name', + 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', // repeat frequencies: From 47361fd77a88af195ec2bc72f07a4da56d7ff972 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 10 Mar 2017 16:11:49 +0100 Subject: [PATCH 037/151] New translations firefly.php (Croatian) --- resources/lang/hr_HR/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/hr_HR/firefly.php b/resources/lang/hr_HR/firefly.php index 69ba02571a..a066c1db19 100644 --- a/resources/lang/hr_HR/firefly.php +++ b/resources/lang/hr_HR/firefly.php @@ -116,6 +116,9 @@ return [ 'multi_select_all_selected' => 'All selected', 'multi_select_filter_placeholder' => 'Find..', 'all_journals_without_budget' => 'All transactions without a budget', + 'journals_without_budget' => 'Transactions without a budget', + 'all_journals_for_account' => 'All transactions for account :name', + 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', // repeat frequencies: From ca0a22d75530be0746c01f61e8983f6ea690698e Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 10 Mar 2017 16:11:56 +0100 Subject: [PATCH 038/151] New translations firefly.php (Chinese Traditional) --- resources/lang/zh_TW/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php index 8303963a8e..078bafd7f4 100644 --- a/resources/lang/zh_TW/firefly.php +++ b/resources/lang/zh_TW/firefly.php @@ -116,6 +116,9 @@ return [ 'multi_select_all_selected' => 'All selected', 'multi_select_filter_placeholder' => 'Find..', 'all_journals_without_budget' => 'All transactions without a budget', + 'journals_without_budget' => 'Transactions without a budget', + 'all_journals_for_account' => 'All transactions for account :name', + 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', // repeat frequencies: From 78276ac66bc638d07373d1966447ab35853cbf4d Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 10 Mar 2017 16:12:09 +0100 Subject: [PATCH 039/151] New translations firefly.php (French) --- resources/lang/fr_FR/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php index 82d68bd3b6..99ecc0d7c8 100644 --- a/resources/lang/fr_FR/firefly.php +++ b/resources/lang/fr_FR/firefly.php @@ -116,6 +116,9 @@ return [ 'multi_select_all_selected' => 'All selected', 'multi_select_filter_placeholder' => 'Find..', 'all_journals_without_budget' => 'All transactions without a budget', + 'journals_without_budget' => 'Transactions without a budget', + 'all_journals_for_account' => 'All transactions for account :name', + 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', // repeat frequencies: From 0c52d54d7d6d400a8efd47832d7e1bddef24b535 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 10 Mar 2017 18:54:50 +0100 Subject: [PATCH 040/151] Optimized some views and fixed tests for #595 --- app/Http/Controllers/BudgetController.php | 30 +++++++++++++++---- app/Http/breadcrumbs.php | 4 +-- resources/views/accounts/delete.twig | 4 ++- resources/views/budgets/no-budget.twig | 10 +++++-- routes/web.php | 1 - .../Controllers/AccountControllerTest.php | 16 ++++------ .../Controllers/BudgetControllerTest.php | 7 +++++ 7 files changed, 49 insertions(+), 23 deletions(-) diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index 9d79bfd7cf..8205914831 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -22,6 +22,7 @@ use FireflyIII\Http\Requests\BudgetIncomeRequest; use FireflyIII\Models\AccountType; use FireflyIII\Models\Budget; use FireflyIII\Models\BudgetLimit; +use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; @@ -215,7 +216,10 @@ class BudgetController extends Controller if (strlen($moment) > 0 && $moment !== 'all') { $start = new Carbon($moment); $end = Navigation::endOfPeriod($start, $range); - $subTitle = trans('firefly.without_budget_between', ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]); + $subTitle = trans( + 'firefly.without_budget_between', + ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] + ); $periods = $this->noBudgetPeriodEntries(); } @@ -242,7 +246,8 @@ class BudgetController extends Controller Log::info('Count is zero, search for journals.'); /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withoutBudget()->withOpposingAccount(); + $collector->setAllAssetAccounts()->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setLimit($pageSize)->setPage($page) + ->withoutBudget()->withOpposingAccount(); $journals = $collector->getPaginatedJournals(); $journals->setPath('/budgets/list/no-budget'); $count = $journals->getCollection()->count(); @@ -256,7 +261,10 @@ class BudgetController extends Controller // fix title: if ((strlen($moment) > 0 && $moment !== 'all') || strlen($moment) === 0) { - $subTitle = trans('firefly.without_budget_between', ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]); + $subTitle = trans( + 'firefly.without_budget_between', + ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] + ); } return view('budgets.no-budget', compact('journals', 'subTitle', 'moment', 'periods', 'start', 'end')); @@ -520,11 +528,21 @@ class BudgetController extends Controller // count journals without budget in this period: /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setAllAssetAccounts()->setRange($end, $currentEnd)->withoutBudget()->withOpposingAccount(); - $journals = $collector->getJournals()->count(); + $collector->setAllAssetAccounts()->setRange($end, $currentEnd)->withoutBudget()->withOpposingAccount()->setTypes([TransactionType::WITHDRAWAL]); + $set = $collector->getJournals(); + $sum = $set->sum('transaction_amount'); + $journals = $set->count(); $dateStr = $end->format('Y-m-d'); $dateName = Navigation::periodShow($end, $range); - $entries->push([$dateStr, $dateName, $journals, clone $end]); + $entries->push( + [ + 'string' => $dateStr, + 'name' => $dateName, + 'count' => $journals, + 'sum' => $sum, + 'date' => clone $end, + ] + ); $end = Navigation::subtractPeriod($end, $range, 1); } $cache->store($entries); diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php index 1d79655dd1..6ef2d16b4b 100644 --- a/app/Http/breadcrumbs.php +++ b/app/Http/breadcrumbs.php @@ -91,7 +91,7 @@ Breadcrumbs::register( Breadcrumbs::register( 'accounts.delete', function (BreadCrumbGenerator $breadcrumbs, Account $account) { - $breadcrumbs->parent('accounts.show', $account); + $breadcrumbs->parent('accounts.show', $account, '', new Carbon, new Carbon); $breadcrumbs->push(trans('firefly.delete_account', ['name' => e($account->name)]), route('accounts.delete', [$account->id])); } ); @@ -99,7 +99,7 @@ Breadcrumbs::register( Breadcrumbs::register( 'accounts.edit', function (BreadCrumbGenerator $breadcrumbs, Account $account) { - $breadcrumbs->parent('accounts.show', $account); + $breadcrumbs->parent('accounts.show', $account, '', new Carbon, new Carbon); $what = config('firefly.shortNamesByFullName.' . $account->accountType->type); $breadcrumbs->push(trans('firefly.edit_' . $what . '_account', ['name' => e($account->name)]), route('accounts.edit', [$account->id])); diff --git a/resources/views/accounts/delete.twig b/resources/views/accounts/delete.twig index 7203d40a25..97a6fab792 100644 --- a/resources/views/accounts/delete.twig +++ b/resources/views/accounts/delete.twig @@ -1,7 +1,9 @@ {% extends "./layout/default" %} {% block breadcrumbs %} - {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute().getName(), account) }} + + {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, account) }} + {{ Route.getCurrentRoute.getName }} {% endblock %} {% block content %} diff --git a/resources/views/budgets/no-budget.twig b/resources/views/budgets/no-budget.twig index 20166e601d..1b169a6270 100644 --- a/resources/views/budgets/no-budget.twig +++ b/resources/views/budgets/no-budget.twig @@ -41,16 +41,20 @@ {% if periods.count > 0 %}
        {% for entry in periods %} -
        +
        -

        {{ entry[1] }} +

        {{ entry.name }}

        - + + + + +
        {{ 'transactions'|_ }}{{ entry[2] }}{{ entry.count }}
        {{ 'sum'|_ }}{{ entry.sum|formatAmount }}
        diff --git a/routes/web.php b/routes/web.php index 2d94859db5..6abaca3534 100755 --- a/routes/web.php +++ b/routes/web.php @@ -86,7 +86,6 @@ Route::group( Route::get('create/{what}', ['uses' => 'AccountController@create', 'as' => 'create'])->where('what', 'revenue|asset|expense'); Route::get('edit/{account}', ['uses' => 'AccountController@edit', 'as' => 'edit']); Route::get('delete/{account}', ['uses' => 'AccountController@delete', 'as' => 'delete']); - Route::get('show/{account}/{moment?}', ['uses' => 'AccountController@show', 'as' => 'show']); Route::post('store', ['uses' => 'AccountController@store', 'as' => 'store']); diff --git a/tests/Feature/Controllers/AccountControllerTest.php b/tests/Feature/Controllers/AccountControllerTest.php index 50f4ece96f..aeec1e506b 100644 --- a/tests/Feature/Controllers/AccountControllerTest.php +++ b/tests/Feature/Controllers/AccountControllerTest.php @@ -158,8 +158,8 @@ class AccountControllerTest extends TestCase $tasker->shouldReceive('amountInInPeriod')->withAnyArgs()->andReturn('1'); $repository = $this->mock(AccountRepositoryInterface::class); - $repository->shouldReceive('oldestJournalDate')->andReturn(clone $date); - $repository->shouldReceive('getAccountsByType')->andReturn(new Collection); + $repository->shouldReceive('oldestJournalDate')->andReturn(clone $date)->once(); + $repository->shouldReceive('getAccountsByType')->andReturn(new Collection)->once(); $transaction = factory(Transaction::class)->make(); $collector = $this->mock(JournalCollectorInterface::class); @@ -190,7 +190,7 @@ class AccountControllerTest extends TestCase $transaction = factory(Transaction::class)->make(); $collector = $this->mock(JournalCollectorInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); + $journalRepos->shouldReceive('first')->twice()->andReturn(new TransactionJournal); $collector->shouldReceive('setAccounts')->andReturnSelf(); $collector->shouldReceive('setRange')->andReturnSelf(); $collector->shouldReceive('setLimit')->andReturnSelf(); @@ -202,10 +202,6 @@ class AccountControllerTest extends TestCase $tasker->shouldReceive('amountOutInPeriod')->withAnyArgs()->andReturn('-1'); $tasker->shouldReceive('amountInInPeriod')->withAnyArgs()->andReturn('1'); - $repository = $this->mock(AccountRepositoryInterface::class); - $repository->shouldReceive('oldestJournalDate')->andReturn(new Carbon)->once(); - $repository->shouldReceive('getAccountsByType')->withArgs([[AccountType::ASSET, AccountType::DEFAULT]])->once()->andReturn(new Collection); - $this->be($this->user()); $this->changeDateRange($this->user(), $range); $response = $this->get(route('accounts.show', [1, 'all'])); @@ -253,14 +249,14 @@ class AccountControllerTest extends TestCase $tasker = $this->mock(AccountTaskerInterface::class); $repository = $this->mock(AccountRepositoryInterface::class); - $repository->shouldReceive('oldestJournalDate')->andReturn(new Carbon); + $repository->shouldReceive('oldestJournalDate')->andReturn(new Carbon)->once(); $repository->shouldReceive('getAccountsByType')->withArgs([[AccountType::ASSET, AccountType::DEFAULT]])->once()->andReturn(new Collection); $tasker->shouldReceive('amountOutInPeriod')->withAnyArgs()->andReturn('-1'); $tasker->shouldReceive('amountInInPeriod')->withAnyArgs()->andReturn('1'); $this->be($this->user()); $this->changeDateRange($this->user(), $range); - $response = $this->get(route('accounts.show.date', [1, '2016-01-01'])); + $response = $this->get(route('accounts.show', [1, '2016-01-01'])); $response->assertStatus(200); // has bread crumb $response->assertSee('
          '); @@ -293,7 +289,7 @@ class AccountControllerTest extends TestCase $this->be($this->user()); $this->changeDateRange($this->user(), $range); - $response = $this->get(route('accounts.show.date', [1, '2016-01-01'])); + $response = $this->get(route('accounts.show', [1, '2016-01-01'])); $response->assertStatus(200); // has bread crumb $response->assertSee('
            '); diff --git a/tests/Feature/Controllers/BudgetControllerTest.php b/tests/Feature/Controllers/BudgetControllerTest.php index fca3c8dc29..2e7fe63d5e 100644 --- a/tests/Feature/Controllers/BudgetControllerTest.php +++ b/tests/Feature/Controllers/BudgetControllerTest.php @@ -159,7 +159,9 @@ class BudgetControllerTest extends TestCase $collector->shouldReceive('getJournals')->andReturn(new Collection); $collector->shouldReceive('setLimit')->andReturnSelf(); $collector->shouldReceive('setPage')->andReturnSelf(); + $collector->shouldReceive('setTypes')->andReturnSelf(); $collector->shouldReceive('withoutBudget')->andReturnSelf(); + $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); @@ -190,8 +192,11 @@ class BudgetControllerTest extends TestCase $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); $collector->shouldReceive('setRange')->andReturnSelf(); $collector->shouldReceive('setLimit')->andReturnSelf(); + $collector->shouldReceive('setTypes')->andReturnSelf(); $collector->shouldReceive('setPage')->andReturnSelf(); + $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); $collector->shouldReceive('withoutBudget')->andReturnSelf(); + $collector->shouldReceive('setTypes')->andReturnSelf(); $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); $collector->shouldReceive('getJournals')->andReturn(new Collection); $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); @@ -226,6 +231,8 @@ class BudgetControllerTest extends TestCase $collector->shouldReceive('getJournals')->andReturn(new Collection); $collector->shouldReceive('setLimit')->andReturnSelf(); $collector->shouldReceive('setPage')->andReturnSelf(); + $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); + $collector->shouldReceive('setTypes')->andReturnSelf(); $collector->shouldReceive('withoutBudget')->andReturnSelf(); $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); From ecbd7ca95b7ed07ee91f5dda9de67a44ab73e871 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 10 Mar 2017 19:34:46 +0100 Subject: [PATCH 041/151] Also implement #595 for the no-cat view. --- app/Http/Controllers/CategoryController.php | 162 ++++++++++++++++-- app/Http/breadcrumbs.php | 19 +- resources/lang/en_US/firefly.php | 7 +- resources/views/budgets/no-budget.twig | 4 +- resources/views/categories/no-category.twig | 73 +++++++- routes/web.php | 2 +- .../Controllers/CategoryControllerTest.php | 76 +++++++- 7 files changed, 315 insertions(+), 28 deletions(-) diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index 373c4fa72f..453ff2d78a 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -18,13 +18,17 @@ use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Http\Requests\CategoryFormRequest; use FireflyIII\Models\AccountType; use FireflyIII\Models\Category; +use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Support\CacheProperties; use Illuminate\Http\Request; use Illuminate\Support\Collection; +use Log; use Navigation; use Preferences; +use Steam; use View; /** @@ -152,24 +156,78 @@ class CategoryController extends Controller /** * @return View */ - public function noCategory() + public function noCategory(Request $request, JournalRepositoryInterface $repository, string $moment = '') { - /** @var Carbon $start */ - $start = session('start', Carbon::now()->startOfMonth()); - /** @var Carbon $end */ - $end = session('end', Carbon::now()->startOfMonth()); + // default values: + $range = Preferences::get('viewRange', '1M')->data; + $start = null; + $end = null; + $periods = new Collection; - // new collector: - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector->setAllAssetAccounts()->setRange($start, $end)->withoutCategory();//->groupJournals(); - $journals = $collector->getJournals(); - $subTitle = trans( - 'firefly.without_category_between', - ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] - ); + // prep for "all" view. + if ($moment === 'all') { + $subTitle = trans('firefly.all_journals_without_category'); + $first = $repository->first(); + $start = $first->date ?? new Carbon; + $end = new Carbon; + } - return view('categories.no-category', compact('journals', 'subTitle')); + // prep for "specific date" view. + if (strlen($moment) > 0 && $moment !== 'all') { + $start = new Carbon($moment); + $end = Navigation::endOfPeriod($start, $range); + $subTitle = trans( + 'firefly.without_category_between', + ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] + ); + $periods = $this->noCategoryPeriodEntries(); + } + + // prep for current period + if (strlen($moment) === 0) { + $start = clone session('start', Navigation::startOfPeriod(new Carbon, $range)); + $end = clone session('end', Navigation::endOfPeriod(new Carbon, $range)); + $periods = $this->noCategoryPeriodEntries(); + $subTitle = trans( + 'firefly.without_category_between', + ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] + ); + } + + $page = intval($request->get('page')) == 0 ? 1 : intval($request->get('page')); + $pageSize = intval(Preferences::get('transactionPageSize', 50)->data); + + $count = 0; + $loop = 0; + // grab journals, but be prepared to jump a period back to get the right ones: + Log::info('Now at no-cat loop start.'); + while ($count === 0 && $loop < 3) { + $loop++; + Log::info('Count is zero, search for journals.'); + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withoutCategory()->withOpposingAccount(); + $collector->disableInternalFilter(); + $journals = $collector->getPaginatedJournals(); + $journals->setPath('/categories/list/no-category'); + $count = $journals->getCollection()->count(); + if ($count === 0) { + $start->subDay(); + $start = Navigation::startOfPeriod($start, $range); + $end = Navigation::endOfPeriod($start, $range); + Log::info(sprintf('Count is still zero, go back in time to "%s" and "%s"!', $start->format('Y-m-d'), $end->format('Y-m-d'))); + } + } + + // fix title: + if ((strlen($moment) > 0 && $moment !== 'all') || strlen($moment) === 0) { + $subTitle = trans( + 'firefly.without_category_between', + ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] + ); + } + + return view('categories.no-category', compact('journals', 'subTitle', 'moment', 'periods', 'start', 'end')); } /** @@ -356,4 +414,78 @@ class CategoryController extends Controller return $entries; } + + /** + * @return Collection + */ + private function noCategoryPeriodEntries(): Collection + { + $repository = app(JournalRepositoryInterface::class); + $first = $repository->first(); + $start = $first->date ?? new Carbon; + $range = Preferences::get('viewRange', '1M')->data; + $start = Navigation::startOfPeriod($start, $range); + $end = Navigation::endOfX(new Carbon, $range); + $entries = new Collection; + + // properties for cache + $cache = new CacheProperties; + $cache->addProperty($start); + $cache->addProperty($end); + $cache->addProperty('no-budget-period-entries'); + + if ($cache->has()) { + return $cache->get(); // @codeCoverageIgnore + } + + Log::debug('Going to get period expenses and incomes.'); + while ($end >= $start) { + $end = Navigation::startOfPeriod($end, $range); + $currentEnd = Navigation::endOfPeriod($end, $range); + + // count journals without budget in this period: + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setAllAssetAccounts()->setRange($end, $currentEnd)->withoutCategory()->withOpposingAccount(); + $count = $collector->getJournals()->count(); + + // amount transferred + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setAllAssetAccounts()->setRange($end, $currentEnd)->withoutCategory() + ->withOpposingAccount()->setTypes([TransactionType::TRANSFER])->disableInternalFilter(); + $transferred = Steam::positive($collector->getJournals()->sum('transaction_amount')); + + // amount spent + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setAllAssetAccounts()->setRange($end, $currentEnd)->withoutCategory()->withOpposingAccount()->setTypes([TransactionType::WITHDRAWAL]); + $spent = $collector->getJournals()->sum('transaction_amount'); + + // amount earned + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setAllAssetAccounts()->setRange($end, $currentEnd)->withoutCategory()->withOpposingAccount()->setTypes([TransactionType::DEPOSIT]); + $earned = $collector->getJournals()->sum('transaction_amount'); + + $dateStr = $end->format('Y-m-d'); + $dateName = Navigation::periodShow($end, $range); + $entries->push( + [ + 'string' => $dateStr, + 'name' => $dateName, + 'count' => $count, + 'spent' => $spent, + 'earned' => $earned, + 'transferred' => $transferred, + 'date' => clone $end, + ] + ); + $end = Navigation::subtractPeriod($end, $range, 1); + } + $cache->store($entries); + + return $entries; + } + } diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php index 6ef2d16b4b..247eb5f482 100644 --- a/app/Http/breadcrumbs.php +++ b/app/Http/breadcrumbs.php @@ -354,12 +354,27 @@ Breadcrumbs::register( ); Breadcrumbs::register( - 'categories.no-category', function (BreadCrumbGenerator $breadcrumbs, $subTitle) { + 'categories.no-category', function (BreadCrumbGenerator $breadcrumbs, string $moment, Carbon $start, Carbon $end) { $breadcrumbs->parent('categories.index'); - $breadcrumbs->push($subTitle, route('categories.no-category')); + $breadcrumbs->push(trans('firefly.journals_without_category'), route('categories.no-category')); + + // push when is all: + if ($moment === 'all') { + $breadcrumbs->push(trans('firefly.all_journals_without_category'), route('categories.no-category', ['all'])); + } + // when is specific period: + if (strlen($moment) > 0 && $moment !== 'all') { + $title = trans('firefly.without_category_between', ['start' => $start->formatLocalized(strval(trans('config.month_and_day'))), + 'end' => $end->formatLocalized(strval(trans('config.month_and_day')))] + ); + $breadcrumbs->push($title, route('categories.no-category', [$moment])); + } + + } ); + /** * CURRENCIES */ diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index cbf0516c67..972214df99 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -116,9 +116,12 @@ return [ 'multi_select_all_selected' => 'All selected', 'multi_select_filter_placeholder' => 'Find..', 'all_journals_without_budget' => 'All transactions without a budget', + 'all_journals_without_category' => 'All transactions without a category', 'journals_without_budget' => 'Transactions without a budget', - 'all_journals_for_account' => 'All transactions for account :name', - 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', + 'journals_without_category' => 'Transactions without a category', + 'all_journals_for_account' => 'All transactions for account :name', + 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', + 'transferred' => 'Transferred', // repeat frequencies: diff --git a/resources/views/budgets/no-budget.twig b/resources/views/budgets/no-budget.twig index 1b169a6270..66b6dbec6a 100644 --- a/resources/views/budgets/no-budget.twig +++ b/resources/views/budgets/no-budget.twig @@ -22,7 +22,7 @@

            {{ subTitle }}

        - {% include 'list.journals-tasker' with {'journals': journals} %} + {% include 'list.journals-tasker' with {'journals': journals,'hideBudgets': true} %} {% if periods.count > 0 %}

        @@ -53,7 +53,7 @@ {{ entry.count }} - {{ 'sum'|_ }} + {{ 'spent'|_ }} {{ entry.sum|formatAmount }} diff --git a/resources/views/categories/no-category.twig b/resources/views/categories/no-category.twig index c302ca0203..f6660a08b7 100644 --- a/resources/views/categories/no-category.twig +++ b/resources/views/categories/no-category.twig @@ -1,23 +1,86 @@ {% extends "./layout/default" %} {% block breadcrumbs %} - {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, subTitle) }} + {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, moment, start, end) }} {% endblock %} {% block content %} + + {# upper show-all instruction #} + {% if periods.count > 0 %} +

        +
        +

        {{ 'showEverything'|_ }}

        +
        +
        + {% endif %} +
        -
        +
        - {{ subTitle }} +

        {{ subTitle }}

        -
        - {% include 'list.journals-tasker' %} +
        + {% include 'list.journals-tasker' with {'journals': journals, 'hideCategories':true} %} + {% if periods.count > 0 %} +

        + + {{ 'show_all_no_filter'|_ }} +

        + {% else %} +

        + + {{ 'show_the_current_period_and_overview'|_ }} +

        + {% endif %}
        + + {% if periods.count > 0 %} +
        + {% for entry in periods %} +
        +
        +

        {{ entry.name }} +

        +
        +
        + + + + + + + + + + + + + + + + + +
        {{ 'transactions'|_ }}{{ entry.count }}
        {{ 'spent'|_ }}{{ entry.spent|formatAmount }}
        {{ 'earned'|_ }}{{ entry.earned|formatAmount }}
        {{ 'transferred'|_ }}{{ entry.transferred|formatAmountPlain }}
        +
        +
        + {% endfor %} +
        + {% endif %} +
        + {# lower show-all instruction #} + {% if periods.count > 0 %} +
        +
        +

        {{ 'showEverything'|_ }}

        +
        +
        + {% endif %} {% endblock %} {% block scripts %} diff --git a/routes/web.php b/routes/web.php index 6abaca3534..cdfeb2ca58 100755 --- a/routes/web.php +++ b/routes/web.php @@ -165,7 +165,7 @@ Route::group( Route::get('show/{category}', ['uses' => 'CategoryController@show', 'as' => 'show']); Route::get('show/{category}/all', ['uses' => 'CategoryController@showAll', 'as' => 'show.all']); Route::get('show/{category}/{date}', ['uses' => 'CategoryController@showByDate', 'as' => 'show.date']); - Route::get('list/no-category', ['uses' => 'CategoryController@noCategory', 'as' => 'no-category']); + Route::get('list/no-category/{moment?}', ['uses' => 'CategoryController@noCategory', 'as' => 'no-category']); Route::post('store', ['uses' => 'CategoryController@store', 'as' => 'store']); Route::post('update/{category}', ['uses' => 'CategoryController@update', 'as' => 'update']); diff --git a/tests/Feature/Controllers/CategoryControllerTest.php b/tests/Feature/Controllers/CategoryControllerTest.php index c66c7a1a7c..5c4ed07c85 100644 --- a/tests/Feature/Controllers/CategoryControllerTest.php +++ b/tests/Feature/Controllers/CategoryControllerTest.php @@ -123,12 +123,20 @@ class CategoryControllerTest extends TestCase // mock stuff $collector = $this->mock(JournalCollectorInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); + $journalRepos->shouldReceive('first')->twice()->andReturn(new TransactionJournal); $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); + $collector->shouldReceive('setTypes')->andReturnSelf(); $collector->shouldReceive('setRange')->andReturnSelf(); + $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); $collector->shouldReceive('withoutCategory')->andReturnSelf(); $collector->shouldReceive('getJournals')->andReturn(new Collection); + $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); + + $collector->shouldReceive('setPage')->andReturnSelf(); + $collector->shouldReceive('disableInternalFilter')->andReturnSelf(); + $collector->shouldReceive('setLimit')->andReturnSelf(); + $this->be($this->user()); $this->changeDateRange($this->user(), $range); @@ -138,6 +146,72 @@ class CategoryControllerTest extends TestCase $response->assertSee('
          '); } + /** + * @covers \FireflyIII\Http\Controllers\CategoryController::noCategory + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testNoCategoryAll(string $range) + { + // mock stuff + $collector = $this->mock(JournalCollectorInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('first')->twice()->andReturn(new TransactionJournal); + + $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); + $collector->shouldReceive('setTypes')->andReturnSelf(); + $collector->shouldReceive('setRange')->andReturnSelf(); + $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); + $collector->shouldReceive('withoutCategory')->andReturnSelf(); + $collector->shouldReceive('getJournals')->andReturn(new Collection); + $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); + + $collector->shouldReceive('setPage')->andReturnSelf(); + $collector->shouldReceive('disableInternalFilter')->andReturnSelf(); + $collector->shouldReceive('setLimit')->andReturnSelf(); + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('categories.no-category', ['all'])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
            '); + } + + /** + * @covers \FireflyIII\Http\Controllers\CategoryController::noCategory + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testNoCategoryDate(string $range) + { + // mock stuff + $collector = $this->mock(JournalCollectorInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('first')->twice()->andReturn(new TransactionJournal); + + $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); + $collector->shouldReceive('setTypes')->andReturnSelf(); + $collector->shouldReceive('setRange')->andReturnSelf(); + $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); + $collector->shouldReceive('withoutCategory')->andReturnSelf(); + $collector->shouldReceive('getJournals')->andReturn(new Collection); + $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); + + $collector->shouldReceive('setPage')->andReturnSelf(); + $collector->shouldReceive('disableInternalFilter')->andReturnSelf(); + $collector->shouldReceive('setLimit')->andReturnSelf(); + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('categories.no-category', ['2016-01-01'])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
              '); + } + /** * @covers \FireflyIII\Http\Controllers\CategoryController::show * @covers \FireflyIII\Http\Controllers\CategoryController::getGroupedEntries From 9dd2f447cc9c1fe2084b0654afa59f2d0f9d2221 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 10 Mar 2017 19:36:22 +0100 Subject: [PATCH 042/151] Fix in date range [skip ci] --- app/Http/Controllers/BudgetController.php | 2 +- app/Http/Controllers/CategoryController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index 8205914831..e82386126d 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -260,7 +260,7 @@ class BudgetController extends Controller } // fix title: - if ((strlen($moment) > 0 && $moment !== 'all') || strlen($moment) === 0) { + if (((strlen($moment) > 0 && $moment !== 'all') || strlen($moment) === 0) && $count > 0) { $subTitle = trans( 'firefly.without_budget_between', ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index 453ff2d78a..eb91a6bf53 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -220,7 +220,7 @@ class CategoryController extends Controller } // fix title: - if ((strlen($moment) > 0 && $moment !== 'all') || strlen($moment) === 0) { + if (((strlen($moment) > 0 && $moment !== 'all') || strlen($moment) === 0) && $count > 0) { $subTitle = trans( 'firefly.without_category_between', ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] From fac3853d95be75c9531ebdd95ab421e4a9683a5c Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 10 Mar 2017 19:40:21 +0100 Subject: [PATCH 043/151] New translations firefly.php (Portuguese, Brazilian) --- resources/lang/pt_BR/firefly.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php index e500d2bfbc..22164f41de 100644 --- a/resources/lang/pt_BR/firefly.php +++ b/resources/lang/pt_BR/firefly.php @@ -116,9 +116,12 @@ return [ 'multi_select_all_selected' => 'All selected', 'multi_select_filter_placeholder' => 'Find..', 'all_journals_without_budget' => 'All transactions without a budget', + 'all_journals_without_category' => 'All transactions without a category', 'journals_without_budget' => 'Transactions without a budget', - 'all_journals_for_account' => 'All transactions for account :name', - 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', + 'journals_without_category' => 'Transactions without a category', + 'all_journals_for_account' => 'All transactions for account :name', + 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', + 'transferred' => 'Transferred', // repeat frequencies: From ca69970242386fc34bb6d8e4f28c679ba2628e8d Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 10 Mar 2017 19:40:25 +0100 Subject: [PATCH 044/151] New translations firefly.php (Polish) --- resources/lang/pl_PL/firefly.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php index 2c13e89d60..2b16201114 100644 --- a/resources/lang/pl_PL/firefly.php +++ b/resources/lang/pl_PL/firefly.php @@ -116,9 +116,12 @@ return [ 'multi_select_all_selected' => 'Wybrano wszystko', 'multi_select_filter_placeholder' => 'Find..', 'all_journals_without_budget' => 'All transactions without a budget', + 'all_journals_without_category' => 'All transactions without a category', 'journals_without_budget' => 'Transactions without a budget', - 'all_journals_for_account' => 'All transactions for account :name', - 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', + 'journals_without_category' => 'Transactions without a category', + 'all_journals_for_account' => 'All transactions for account :name', + 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', + 'transferred' => 'Transferred', // repeat frequencies: From 82a37c62c15452152bb5e39f04d6f6e0eda47964 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 10 Mar 2017 19:40:30 +0100 Subject: [PATCH 045/151] New translations firefly.php (German) --- resources/lang/de_DE/firefly.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php index da46651515..368d76a959 100644 --- a/resources/lang/de_DE/firefly.php +++ b/resources/lang/de_DE/firefly.php @@ -116,9 +116,12 @@ return [ 'multi_select_all_selected' => 'Alle ausgewählt', 'multi_select_filter_placeholder' => 'Suche..', 'all_journals_without_budget' => 'All transactions without a budget', + 'all_journals_without_category' => 'All transactions without a category', 'journals_without_budget' => 'Transactions without a budget', - 'all_journals_for_account' => 'All transactions for account :name', - 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', + 'journals_without_category' => 'Transactions without a category', + 'all_journals_for_account' => 'All transactions for account :name', + 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', + 'transferred' => 'Transferred', // repeat frequencies: From 69ae2e93f8dcb7144b264ed3ce6a404a28d315e2 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 10 Mar 2017 19:40:40 +0100 Subject: [PATCH 046/151] New translations firefly.php (Spanish) --- resources/lang/es_ES/firefly.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php index a066c1db19..94acef7415 100644 --- a/resources/lang/es_ES/firefly.php +++ b/resources/lang/es_ES/firefly.php @@ -116,9 +116,12 @@ return [ 'multi_select_all_selected' => 'All selected', 'multi_select_filter_placeholder' => 'Find..', 'all_journals_without_budget' => 'All transactions without a budget', + 'all_journals_without_category' => 'All transactions without a category', 'journals_without_budget' => 'Transactions without a budget', - 'all_journals_for_account' => 'All transactions for account :name', - 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', + 'journals_without_category' => 'Transactions without a category', + 'all_journals_for_account' => 'All transactions for account :name', + 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', + 'transferred' => 'Transferred', // repeat frequencies: From d4787aca9cdad83d8aa1866e8c6ce9eaeff882b9 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 10 Mar 2017 19:40:45 +0100 Subject: [PATCH 047/151] New translations firefly.php (Dutch) --- resources/lang/nl_NL/firefly.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php index bded46293a..9e256898a6 100644 --- a/resources/lang/nl_NL/firefly.php +++ b/resources/lang/nl_NL/firefly.php @@ -116,9 +116,12 @@ return [ 'multi_select_all_selected' => 'Alles geselecteerd', 'multi_select_filter_placeholder' => 'Vinden..', 'all_journals_without_budget' => 'All transactions without a budget', + 'all_journals_without_category' => 'All transactions without a category', 'journals_without_budget' => 'Transactions without a budget', - 'all_journals_for_account' => 'All transactions for account :name', - 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', + 'journals_without_category' => 'Transactions without a category', + 'all_journals_for_account' => 'All transactions for account :name', + 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', + 'transferred' => 'Transferred', // repeat frequencies: From b0600273049019ef56bbada2cabb021aa1937a6e Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 10 Mar 2017 19:40:51 +0100 Subject: [PATCH 048/151] New translations firefly.php (Russian) --- resources/lang/ru_RU/firefly.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/resources/lang/ru_RU/firefly.php b/resources/lang/ru_RU/firefly.php index a066c1db19..94acef7415 100644 --- a/resources/lang/ru_RU/firefly.php +++ b/resources/lang/ru_RU/firefly.php @@ -116,9 +116,12 @@ return [ 'multi_select_all_selected' => 'All selected', 'multi_select_filter_placeholder' => 'Find..', 'all_journals_without_budget' => 'All transactions without a budget', + 'all_journals_without_category' => 'All transactions without a category', 'journals_without_budget' => 'Transactions without a budget', - 'all_journals_for_account' => 'All transactions for account :name', - 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', + 'journals_without_category' => 'Transactions without a category', + 'all_journals_for_account' => 'All transactions for account :name', + 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', + 'transferred' => 'Transferred', // repeat frequencies: From c88cfa2d9d5a9185ebac710ff10bb8bad900d020 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 10 Mar 2017 19:41:03 +0100 Subject: [PATCH 049/151] New translations firefly.php (Chinese Traditional, Hong Kong) --- resources/lang/zh_HK/firefly.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/resources/lang/zh_HK/firefly.php b/resources/lang/zh_HK/firefly.php index a066c1db19..94acef7415 100644 --- a/resources/lang/zh_HK/firefly.php +++ b/resources/lang/zh_HK/firefly.php @@ -116,9 +116,12 @@ return [ 'multi_select_all_selected' => 'All selected', 'multi_select_filter_placeholder' => 'Find..', 'all_journals_without_budget' => 'All transactions without a budget', + 'all_journals_without_category' => 'All transactions without a category', 'journals_without_budget' => 'Transactions without a budget', - 'all_journals_for_account' => 'All transactions for account :name', - 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', + 'journals_without_category' => 'Transactions without a category', + 'all_journals_for_account' => 'All transactions for account :name', + 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', + 'transferred' => 'Transferred', // repeat frequencies: From d400060b8b1db4bb0c7e689f5cf36722db2a1b29 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 10 Mar 2017 19:41:10 +0100 Subject: [PATCH 050/151] New translations firefly.php (Croatian) --- resources/lang/hr_HR/firefly.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/resources/lang/hr_HR/firefly.php b/resources/lang/hr_HR/firefly.php index a066c1db19..94acef7415 100644 --- a/resources/lang/hr_HR/firefly.php +++ b/resources/lang/hr_HR/firefly.php @@ -116,9 +116,12 @@ return [ 'multi_select_all_selected' => 'All selected', 'multi_select_filter_placeholder' => 'Find..', 'all_journals_without_budget' => 'All transactions without a budget', + 'all_journals_without_category' => 'All transactions without a category', 'journals_without_budget' => 'Transactions without a budget', - 'all_journals_for_account' => 'All transactions for account :name', - 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', + 'journals_without_category' => 'Transactions without a category', + 'all_journals_for_account' => 'All transactions for account :name', + 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', + 'transferred' => 'Transferred', // repeat frequencies: From b816fbdf827880d7244167e021eaab3c7528776d Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 10 Mar 2017 19:41:17 +0100 Subject: [PATCH 051/151] New translations firefly.php (Chinese Traditional) --- resources/lang/zh_TW/firefly.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php index 078bafd7f4..7a04e49f99 100644 --- a/resources/lang/zh_TW/firefly.php +++ b/resources/lang/zh_TW/firefly.php @@ -116,9 +116,12 @@ return [ 'multi_select_all_selected' => 'All selected', 'multi_select_filter_placeholder' => 'Find..', 'all_journals_without_budget' => 'All transactions without a budget', + 'all_journals_without_category' => 'All transactions without a category', 'journals_without_budget' => 'Transactions without a budget', - 'all_journals_for_account' => 'All transactions for account :name', - 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', + 'journals_without_category' => 'Transactions without a category', + 'all_journals_for_account' => 'All transactions for account :name', + 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', + 'transferred' => 'Transferred', // repeat frequencies: From 22cca3858c5050db6c6f96c73db29b259bbb3969 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 10 Mar 2017 19:41:27 +0100 Subject: [PATCH 052/151] New translations firefly.php (French) --- resources/lang/fr_FR/firefly.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php index 99ecc0d7c8..88785a47f4 100644 --- a/resources/lang/fr_FR/firefly.php +++ b/resources/lang/fr_FR/firefly.php @@ -116,9 +116,12 @@ return [ 'multi_select_all_selected' => 'All selected', 'multi_select_filter_placeholder' => 'Find..', 'all_journals_without_budget' => 'All transactions without a budget', + 'all_journals_without_category' => 'All transactions without a category', 'journals_without_budget' => 'Transactions without a budget', - 'all_journals_for_account' => 'All transactions for account :name', - 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', + 'journals_without_category' => 'Transactions without a category', + 'all_journals_for_account' => 'All transactions for account :name', + 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', + 'transferred' => 'Transferred', // repeat frequencies: From 4abc2718052dfb72b4ba23d2599bf6b9b85598af Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 11 Mar 2017 07:41:26 +0100 Subject: [PATCH 053/151] Implemented #595 for transactions. --- .../Controllers/TransactionController.php | 232 +++++++++++------- app/Http/breadcrumbs.php | 67 ++--- app/Support/Navigation.php | 2 +- resources/lang/en_US/firefly.php | 11 +- resources/views/transactions/index-all.twig | 27 -- resources/views/transactions/index-date.twig | 33 --- resources/views/transactions/index.twig | 85 +++++-- routes/web.php | 10 +- .../Controllers/TransactionControllerTest.php | 16 +- 9 files changed, 257 insertions(+), 226 deletions(-) delete mode 100644 resources/views/transactions/index-all.twig delete mode 100644 resources/views/transactions/index-date.twig diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index e89143d8b7..b0fc0e28ee 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -14,16 +14,19 @@ declare(strict_types = 1); namespace FireflyIII\Http\Controllers; use Carbon\Carbon; +use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\Journal\JournalTaskerInterface; +use FireflyIII\Support\CacheProperties; use Illuminate\Http\Request; use Illuminate\Support\Collection; use Log; use Navigation; use Preferences; use Response; +use Steam; use View; /** @@ -59,109 +62,78 @@ class TransactionController extends Controller * * @return View */ - public function index(Request $request, JournalRepositoryInterface $repository, string $what) + public function index(Request $request, JournalRepositoryInterface $repository, string $what, string $moment = '') { - $pageSize = intval(Preferences::get('transactionPageSize', 50)->data); + // default values: $subTitleIcon = config('firefly.transactionIconsByWhat.' . $what); $types = config('firefly.transactionTypesByWhat.' . $what); - $subTitle = trans('firefly.title_' . $what); + $page = intval($request->get('page')) == 0 ? 1 : intval($request->get('page')); + $pageSize = intval(Preferences::get('transactionPageSize', 50)->data); + $count = 0; + $loop = 0; $range = Preferences::get('viewRange', '1M')->data; - $page = intval($request->get('page')) === 0 ? 1 : intval($request->get('page')); - // to make sure we only grab a subset, based on the current date (in session): - $start = session('start', Navigation::startOfPeriod(new Carbon, $range)); - $end = session('end', Navigation::endOfPeriod(new Carbon, $range)); + $start = null; + $end = null; + $periods = new Collection; - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector->setTypes($types)->setLimit($pageSize)->setPage($page)->setAllAssetAccounts()->setRange($start, $end)->withBudgetInformation() - ->withCategoryInformation(); - $collector->withOpposingAccount(); - $collector->disableInternalFilter(); - $journals = $collector->getPaginatedJournals(); - $journals->setPath('transactions/' . $what); - - unset($start, $end); - - // then also show a list of periods where the user can click on, based on the - // user's range and the oldest journal the user has: - $first = $repository->first(); - $blockStart = is_null($first->id) ? new Carbon : $first->date; - $blockStart = Navigation::startOfPeriod($blockStart, $range); - $blockEnd = Navigation::endOfX(new Carbon, $range); - $entries = new Collection; - - while ($blockEnd >= $blockStart) { - Log::debug(sprintf('Now at blockEnd: %s', $blockEnd->format('Y-m-d'))); - $blockEnd = Navigation::startOfPeriod($blockEnd, $range); - $dateStr = $blockEnd->format('Y-m-d'); - $dateName = Navigation::periodShow($blockEnd, $range); - $entries->push([$dateStr, $dateName]); - $blockEnd = Navigation::subtractPeriod($blockEnd, $range, 1); + // prep for "all" view. + if ($moment === 'all') { + $subTitle = trans('firefly.all_' . $what); + $first = $repository->first(); + $start = $first->date ?? new Carbon; + $end = new Carbon; } - return view('transactions.index', compact('subTitle', 'what', 'subTitleIcon', 'journals', 'entries')); + // prep for "specific date" view. + if (strlen($moment) > 0 && $moment !== 'all') { + $start = new Carbon($moment); + $end = Navigation::endOfPeriod($start, $range); + $subTitle = trans( + 'firefly.title_' . $what . '_between', + ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] + ); + $periods = $this->getPeriodEntries($what); + } - } + // prep for current period + if (strlen($moment) === 0) { + $start = clone session('start', Navigation::startOfPeriod(new Carbon, $range)); + $end = clone session('end', Navigation::endOfPeriod(new Carbon, $range)); + $periods = $this->getPeriodEntries($what); + $subTitle = trans( + 'firefly.title_' . $what . '_between', + ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] + ); + } + // grab journals, but be prepared to jump a period back to get the right ones: + Log::info('Now at transaction loop start.'); + while ($count === 0 && $loop < 3) { + $loop++; + Log::info('Count is zero, search for journals.'); + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setAllAssetAccounts()->setRange($start, $end)->setTypes($types)->setLimit($pageSize)->setPage($page)->withOpposingAccount() + ->disableInternalFilter(); + $journals = $collector->getPaginatedJournals(); + $journals->setPath('/budgets/list/no-budget'); + $count = $journals->getCollection()->count(); + if ($count === 0) { + $start->subDay(); + $start = Navigation::startOfPeriod($start, $range); + $end = Navigation::endOfPeriod($start, $range); + Log::info(sprintf('Count is still zero, go back in time to "%s" and "%s"!', $start->format('Y-m-d'), $end->format('Y-m-d'))); + } + } - /** - * @param Request $request - * @param string $what - * - * @return View - */ - public function indexAll(Request $request, string $what) - { - $pageSize = intval(Preferences::get('transactionPageSize', 50)->data); - $subTitleIcon = config('firefly.transactionIconsByWhat.' . $what); - $types = config('firefly.transactionTypesByWhat.' . $what); - $subTitle = sprintf('%s (%s)', trans('firefly.title_' . $what), strtolower(trans('firefly.everything'))); - $page = intval($request->get('page')) === 0 ? 1 : intval($request->get('page')); + // fix title: + if (((strlen($moment) > 0 && $moment !== 'all') || strlen($moment) === 0) && $count > 0) { + $subTitle = trans( + 'firefly.title_' . $what . '_between', + ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] + ); + } - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector->setTypes($types)->setLimit($pageSize)->setPage($page)->setAllAssetAccounts()->withBudgetInformation()->withCategoryInformation(); - $collector->withOpposingAccount(); - $collector->disableInternalFilter(); - - $journals = $collector->getPaginatedJournals(); - $journals->setPath('transactions/' . $what . '/all'); - - return view('transactions.index-all', compact('subTitle', 'what', 'subTitleIcon', 'journals')); - - } - - /** - * @param Request $request - * @param string $what - * - * @param string $date - * - * @return View - */ - public function indexByDate(Request $request, string $what, string $date) - { - $carbon = new Carbon($date); - $range = Preferences::get('viewRange', '1M')->data; - $start = Navigation::startOfPeriod($carbon, $range); - $end = Navigation::endOfPeriod($carbon, $range); - $pageSize = intval(Preferences::get('transactionPageSize', 50)->data); - $subTitleIcon = config('firefly.transactionIconsByWhat.' . $what); - $types = config('firefly.transactionTypesByWhat.' . $what); - $subTitle = trans('firefly.title_' . $what) . ' (' . Navigation::periodShow($carbon, $range) . ')'; - $page = intval($request->get('page')) === 0 ? 1 : intval($request->get('page')); - - Log::debug(sprintf('Transaction index by date will show between %s and %s', $start->format('Y-m-d'), $end->format('Y-m-d'))); - - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector->setTypes($types)->setLimit($pageSize)->setPage($page)->setAllAssetAccounts(); - $collector->setRange($start, $end)->withBudgetInformation()->withCategoryInformation(); - $collector->withOpposingAccount(); - $collector->disableInternalFilter(); - $journals = $collector->getPaginatedJournals(); - $journals->setPath('transactions/' . $what . '/' . $date); - - return view('transactions.index-date', compact('subTitle', 'what', 'subTitleIcon', 'journals', 'carbon')); + return view('transactions.index', compact('subTitle', 'what', 'subTitleIcon', 'journals', 'periods', 'start', 'end', 'moment')); } @@ -215,4 +187,78 @@ class TransactionController extends Controller } + /** + * @param string $what + * + * @return Collection + * @throws FireflyException + */ + private function getPeriodEntries(string $what): Collection + { + $repository = app(JournalRepositoryInterface::class); + $first = $repository->first(); + $start = $first->date ?? new Carbon; + $range = Preferences::get('viewRange', '1M')->data; + $start = Navigation::startOfPeriod($start, $range); + $end = Navigation::endOfX(new Carbon, $range); + $entries = new Collection; + $types = config('firefly.transactionTypesByWhat.' . $what); + + // properties for cache + $cache = new CacheProperties; + $cache->addProperty($start); + $cache->addProperty($end); + $cache->addProperty($what); + $cache->addProperty('transaction-list-entries'); + + if ($cache->has()) { + return $cache->get(); // @codeCoverageIgnore + } + + Log::debug('Going to get period expenses and incomes.'); + while ($end >= $start) { + $end = Navigation::startOfPeriod($end, $range); + $currentEnd = Navigation::endOfPeriod($end, $range); + + // count journals without budget in this period: + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setAllAssetAccounts()->setRange($end, $currentEnd)->withOpposingAccount()->setTypes($types)->disableInternalFilter(); + $set = $collector->getJournals(); + $sum = $set->sum('transaction_amount'); + $journals = $set->count(); + $dateStr = $end->format('Y-m-d'); + $dateName = Navigation::periodShow($end, $range); + $array = [ + 'string' => $dateStr, + 'name' => $dateName, + 'count' => $journals, + 'spent' => 0, + 'earned' => 0, + 'transferred' => 0, + 'date' => clone $end, + ]; + switch ($what) { + default: + throw new FireflyException(sprintf('Cannot handle "%s"', $what)); + case 'withdrawal': + $array['spent'] = $sum; + break; + case 'deposit': + $array['earned'] = $sum; + break; + case 'transfers': + case 'transfer': + $array['transferred'] = Steam::positive($sum); + break; + + } + $entries->push($array); + $end = Navigation::subtractPeriod($end, $range, 1); + } + $cache->store($entries); + + return $entries; + } + } diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php index 247eb5f482..3da5f9bd88 100644 --- a/app/Http/breadcrumbs.php +++ b/app/Http/breadcrumbs.php @@ -75,14 +75,10 @@ Breadcrumbs::register( // push when is all: if ($moment === 'all') { - $breadcrumbs->push(trans('firefly.all_journals_for_account', ['name' => $account->name]), route('accounts.show', [$account->id])); + $breadcrumbs->push(trans('firefly.everything'), route('accounts.show', [$account->id])); } // when is specific period: - if (strlen($moment) > 0 && $moment !== 'all') { - $title = trans('firefly.journals_in_period_for_account', ['name' => $account->name, - 'start' => $start->formatLocalized(strval(trans('config.month_and_day'))), - 'end' => $end->formatLocalized(strval(trans('config.month_and_day')))] - ); + if (strlen($moment) > 0 && $moment !== 'all') {$title = trans('firefly.between_dates_breadcrumb', ['start' => $start->formatLocalized(strval(trans('config.month_and_day'))), 'end' => $end->formatLocalized(strval(trans('config.month_and_day')))]); $breadcrumbs->push($title, route('accounts.show', [$account->id, $moment])); } @@ -255,12 +251,12 @@ Breadcrumbs::register( // push when is all: if ($moment === 'all') { - $breadcrumbs->push(trans('firefly.all_journals_without_budget'), route('budgets.no-budget', ['all'])); + $breadcrumbs->push(trans('firefly.everything'), route('budgets.no-budget', ['all'])); } // when is specific period: if (strlen($moment) > 0 && $moment !== 'all') { - $title = trans('firefly.without_budget_between', ['start' => $start->formatLocalized(strval(trans('config.month_and_day'))), - 'end' => $end->formatLocalized(strval(trans('config.month_and_day')))] + $title = trans('firefly.between_dates_breadcrumb', ['start' => $start->formatLocalized(strval(trans('config.month_and_day'))), + 'end' => $end->formatLocalized(strval(trans('config.month_and_day')))] ); $breadcrumbs->push($title, route('budgets.no-budget', [$moment])); } @@ -282,11 +278,8 @@ Breadcrumbs::register( $breadcrumbs->push(e($budget->name), route('budgets.show', [$budget->id])); $title = trans( - 'firefly.budget_in_period_breadcrumb', [ - 'name' => $budget->name, - 'start' => $budgetLimit->start_date->formatLocalized(strval(trans('config.month_and_day'))), - 'end' => $budgetLimit->end_date->formatLocalized(strval(trans('config.month_and_day'))), - ] + 'firefly.between_dates_breadcrumb', ['start' => $budgetLimit->start_date->formatLocalized(strval(trans('config.month_and_day'))), + 'end' => $budgetLimit->end_date->formatLocalized(strval(trans('config.month_and_day'))),] ); $breadcrumbs->push( @@ -360,12 +353,13 @@ Breadcrumbs::register( // push when is all: if ($moment === 'all') { - $breadcrumbs->push(trans('firefly.all_journals_without_category'), route('categories.no-category', ['all'])); + $breadcrumbs->push(trans('firefly.everything'), route('categories.no-category', ['all'])); } // when is specific period: if (strlen($moment) > 0 && $moment !== 'all') { - $title = trans('firefly.without_category_between', ['start' => $start->formatLocalized(strval(trans('config.month_and_day'))), - 'end' => $end->formatLocalized(strval(trans('config.month_and_day')))] + $title = trans( + 'firefly.between_dates_breadcrumb', ['start' => $start->formatLocalized(strval(trans('config.month_and_day'))), + 'end' => $end->formatLocalized(strval(trans('config.month_and_day')))] ); $breadcrumbs->push($title, route('categories.no-category', [$moment])); } @@ -741,36 +735,27 @@ Breadcrumbs::register( * TRANSACTIONS */ Breadcrumbs::register( - 'transactions.index', function (BreadCrumbGenerator $breadcrumbs, string $what) { + 'transactions.index', function (BreadCrumbGenerator $breadcrumbs, string $what, string $moment = '', Carbon $start, Carbon $end) { + + $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.' . $what . '_list'), route('transactions.index', [$what])); -} -); + if($moment === 'all') { + $breadcrumbs->push(trans('firefly.everything'), route('transactions.index', [$what, 'all'])); + } -Breadcrumbs::register( - 'transactions.index.all', function (BreadCrumbGenerator $breadcrumbs, string $what) { - $breadcrumbs->parent('transactions.index', $what); + // when is specific period: + if (strlen($moment) > 0 && $moment !== 'all') { + $title = trans('firefly.between_dates_breadcrumb', ['start' => $start->formatLocalized(strval(trans('config.month_and_day'))), 'end' => $end->formatLocalized(strval(trans('config.month_and_day')))]); + $breadcrumbs->push($title, route('transactions.index', [$what, $moment])); + } - $title = sprintf('%s (%s)', trans('breadcrumbs.' . $what . '_list'), strtolower(trans('firefly.everything'))); - - $breadcrumbs->push($title, route('transactions.index.all', [$what])); -} -); - -Breadcrumbs::register( - 'transactions.index.date', function (BreadCrumbGenerator $breadcrumbs, string $what, Carbon $date) { - $breadcrumbs->parent('transactions.index', $what); - - $range = Preferences::get('viewRange', '1M')->data; - $title = trans('breadcrumbs.' . $what . '_list') . ' (' . Navigation::periodShow($date, $range) . ')'; - - $breadcrumbs->push($title, route('transactions.index.date', [$what, $date->format('Y-m-d')])); } ); Breadcrumbs::register( 'transactions.create', function (BreadCrumbGenerator $breadcrumbs, string $what) { - $breadcrumbs->parent('transactions.index', $what); + $breadcrumbs->parent('transactions.index', $what,'', new Carbon, new Carbon); $breadcrumbs->push(trans('breadcrumbs.create_' . e($what)), route('transactions.create', [$what])); } ); @@ -792,7 +777,7 @@ Breadcrumbs::register( 'transactions.show', function (BreadCrumbGenerator $breadcrumbs, TransactionJournal $journal) { $what = strtolower($journal->transactionType->type); - $breadcrumbs->parent('transactions.index', $what); + $breadcrumbs->parent('transactions.index', $what,'', new Carbon, new Carbon); $breadcrumbs->push($journal->description, route('transactions.show', [$journal->id])); } ); @@ -817,7 +802,7 @@ Breadcrumbs::register( if ($journals->count() > 0) { $journalIds = $journals->pluck('id')->toArray(); $what = strtolower($journals->first()->transactionType->type); - $breadcrumbs->parent('transactions.index', $what); + $breadcrumbs->parent('transactions.index', $what,'', new Carbon, new Carbon); $breadcrumbs->push(trans('firefly.mass_edit_journals'), route('transactions.mass.edit', $journalIds)); return; @@ -832,7 +817,7 @@ Breadcrumbs::register( $journalIds = $journals->pluck('id')->toArray(); $what = strtolower($journals->first()->transactionType->type); - $breadcrumbs->parent('transactions.index', $what); + $breadcrumbs->parent('transactions.index', $what,'', new Carbon, new Carbon); $breadcrumbs->push(trans('firefly.mass_edit_journals'), route('transactions.mass.delete', $journalIds)); } ); diff --git a/app/Support/Navigation.php b/app/Support/Navigation.php index cbdeafbabc..8bd46c59fe 100644 --- a/app/Support/Navigation.php +++ b/app/Support/Navigation.php @@ -72,7 +72,7 @@ class Navigation * @return \Carbon\Carbon * @throws FireflyException */ - public function endOfPeriod(Carbon $end, string $repeatFreq): Carbon + public function endOfPeriod(\Carbon\Carbon $end, string $repeatFreq): Carbon { $currentEnd = clone $end; diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 972214df99..106c8a77d7 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -115,13 +115,22 @@ return [ 'multi_select_no_selection' => 'None selected', 'multi_select_all_selected' => 'All selected', 'multi_select_filter_placeholder' => 'Find..', + 'between_dates_breadcrumb' => 'Between :start and :end', 'all_journals_without_budget' => 'All transactions without a budget', - 'all_journals_without_category' => 'All transactions without a category', 'journals_without_budget' => 'Transactions without a budget', + 'all_journals_without_category' => 'All transactions without a category', 'journals_without_category' => 'Transactions without a category', 'all_journals_for_account' => 'All transactions for account :name', 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', 'transferred' => 'Transferred', + 'all_withdrawal' => 'All expenses', + 'title_withdrawal_between' => 'All expenses between :start and :end', + 'all_deposit' => 'All revenue', + 'title_deposit_between' => 'All revenue between :start and :end', + 'all_transfers' => 'All transfers', + 'title_transfers_between' => 'All transfers between :start and :end', + 'all_transfer' => 'All transfers', + 'title_transfer_between' => 'All transfers between :start and :end', // repeat frequencies: diff --git a/resources/views/transactions/index-all.twig b/resources/views/transactions/index-all.twig deleted file mode 100644 index 794c255614..0000000000 --- a/resources/views/transactions/index-all.twig +++ /dev/null @@ -1,27 +0,0 @@ -{% extends "./layout/default" %} - -{% block breadcrumbs %} - {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, what) }} -{% endblock %} - -{% block content %} - {% if journals.count == 0 %} - {% include 'partials.empty' with {what: what, type: 'transactions',route: route('transactions.create', [what])} %} - {% else %} -
              -
              -
              -
              -

              {{ subTitle }}

              -
              -
              - {% include 'list.journals-tasker' %} -
              -
              -
              -
              - {% endif %} -{% endblock %} -{% block scripts %} - -{% endblock %} diff --git a/resources/views/transactions/index-date.twig b/resources/views/transactions/index-date.twig deleted file mode 100644 index 78df4d16d8..0000000000 --- a/resources/views/transactions/index-date.twig +++ /dev/null @@ -1,33 +0,0 @@ -{% extends "./layout/default" %} - -{% block breadcrumbs %} - {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, what, carbon) }} -{% endblock %} - -{% block content %} - {% if journals.count == 0 %} -
              -
              -

              - {{ 'no_transactions_in_period'|_ }} -

              -
              -
              - {% else %} -
              -
              -
              -
              -

              {{ subTitle }}

              -
              -
              - {% include 'list.journals-tasker' %} -
              -
              -
              -
              - {% endif %} -{% endblock %} -{% block scripts %} - -{% endblock %} diff --git a/resources/views/transactions/index.twig b/resources/views/transactions/index.twig index 33f8253f0c..fa64dff78f 100644 --- a/resources/views/transactions/index.twig +++ b/resources/views/transactions/index.twig @@ -1,46 +1,93 @@ {% extends "./layout/default" %} {% block breadcrumbs %} - {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, what) }} + {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, what, moment, start, end) }} {% endblock %} {% block content %} - + {# upper show-all instruction #} + {% if periods.count > 0 %}
              -
              -
              -
              -

              {{ subTitle }}

              -
              -
              - {% include 'list.journals-tasker' %} +
              +

              {{ 'showEverything'|_ }}

              +
              +
              + {% endif %} + +
              +
              +
              +
              +

              {{ subTitle }}

              +
              +
              + {% include 'list.journals-tasker' with {'journals': journals} %} + {% if periods.count > 0 %}

              - - {{ 'show_all_no_filter'|_ }} - + {{ 'show_all_no_filter'|_ }}

              -
              + {% else %} +

              + + {{ 'show_the_current_period_and_overview'|_ }} +

              + {% endif %}
              +
              + {% if periods.count > 0 %}
              - {% for entry in entries %} -
              + {% for entry in periods %} +
              -

              - {{ entry[1] }} +

              {{ entry.name }}

              -
              -   +
              + + + + + + {% if what == 'withdrawal' %} + + + + + {% endif %} + {% if what == 'deposit' %} + + + + + {% endif %} + {% if what == 'transfers' or what == 'transfer' %} + + + + + {% endif %} +
              {{ 'transactions'|_ }}{{ entry.count }}
              {{ 'spent'|_ }}{{ entry.spent|formatAmount }}
              {{ 'earned'|_ }}{{ entry.earned|formatAmount }}
              {{ 'transferred'|_ }}{{ entry.transferred|formatAmountPlain }}
              {% endfor %}
              + {% endif %} +
              + + {# lower show-all instruction #} + {% if periods.count > 0 %} +
              +
              +

              {{ 'showEverything'|_ }}

              +
              + {% endif %} + {% endblock %} {% block scripts %} diff --git a/routes/web.php b/routes/web.php index cdfeb2ca58..5e15748ca5 100755 --- a/routes/web.php +++ b/routes/web.php @@ -662,11 +662,11 @@ Route::group( */ Route::group( ['middleware' => 'user-full-auth', 'prefix' => 'transactions', 'as' => 'transactions.'], function () { - Route::get('{what}', ['uses' => 'TransactionController@index', 'as' => 'index'])->where(['what' => 'withdrawal|deposit|transfers|transfer']); - Route::get('{what}/all', ['uses' => 'TransactionController@indexAll', 'as' => 'index.all'])->where(['what' => 'withdrawal|deposit|transfers|transfer']); - Route::get('{what}/{date}', ['uses' => 'TransactionController@indexByDate', 'as' => 'index.date'])->where( - ['what' => 'withdrawal|deposit|transfers|transfer'] - ); + Route::get('{what}/{moment?}', ['uses' => 'TransactionController@index', 'as' => 'index'])->where(['what' => 'withdrawal|deposit|transfers|transfer']); +// Route::get('{what}/all', ['uses' => 'TransactionController@indexAll', 'as' => 'index.all'])->where(['what' => 'withdrawal|deposit|transfers|transfer']); +// Route::get('{what}/{date}', ['uses' => 'TransactionController@indexByDate', 'as' => 'index.date'])->where( +// ['what' => 'withdrawal|deposit|transfers|transfer'] +// ); Route::get('show/{tj}', ['uses' => 'TransactionController@show', 'as' => 'show']); Route::post('reorder', ['uses' => 'TransactionController@reorder', 'as' => 'reorder']); } diff --git a/tests/Feature/Controllers/TransactionControllerTest.php b/tests/Feature/Controllers/TransactionControllerTest.php index afb8108363..a2f01787ae 100644 --- a/tests/Feature/Controllers/TransactionControllerTest.php +++ b/tests/Feature/Controllers/TransactionControllerTest.php @@ -43,6 +43,7 @@ class TransactionControllerTest extends TestCase $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); $collector->shouldReceive('disableInternalFilter')->andReturnSelf(); $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); + $collector->shouldReceive('getJournals')->andReturn(new Collection); $this->be($this->user()); $response = $this->get(route('transactions.index', ['transfer'])); @@ -52,14 +53,14 @@ class TransactionControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\TransactionController::indexAll + * @covers \FireflyIII\Http\Controllers\TransactionController::index */ public function testIndexAll() { // mock stuff $repository = $this->mock(JournalRepositoryInterface::class); $collector = $this->mock(JournalCollectorInterface::class); - $repository->shouldReceive('first')->once()->andReturn(new TransactionJournal); + $repository->shouldReceive('first')->twice()->andReturn(new TransactionJournal); $collector->shouldReceive('setTypes')->andReturnSelf(); $collector->shouldReceive('setLimit')->andReturnSelf(); @@ -71,23 +72,24 @@ class TransactionControllerTest extends TestCase $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); $collector->shouldReceive('disableInternalFilter')->andReturnSelf(); $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); + $collector->shouldReceive('getJournals')->andReturn(new Collection); $this->be($this->user()); - $response = $this->get(route('transactions.index.all', ['transfer'])); + $response = $this->get(route('transactions.index', ['transfer','all'])); $response->assertStatus(200); // has bread crumb $response->assertSee('
                '); } /** - * @covers \FireflyIII\Http\Controllers\TransactionController::indexByDate + * @covers \FireflyIII\Http\Controllers\TransactionController::index */ public function testIndexByDate() { // mock stuff $repository = $this->mock(JournalRepositoryInterface::class); $collector = $this->mock(JournalCollectorInterface::class); - $repository->shouldReceive('first')->once()->andReturn(new TransactionJournal); + $repository->shouldReceive('first')->twice()->andReturn(new TransactionJournal); $collector->shouldReceive('setTypes')->andReturnSelf(); $collector->shouldReceive('setLimit')->andReturnSelf(); @@ -99,9 +101,11 @@ class TransactionControllerTest extends TestCase $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); $collector->shouldReceive('disableInternalFilter')->andReturnSelf(); $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); + $collector->shouldReceive('getJournals')->andReturn(new Collection); + $this->be($this->user()); - $response = $this->get(route('transactions.index.date', ['transfer', '2016-01-01'])); + $response = $this->get(route('transactions.index', ['transfer', '2016-01-01'])); $response->assertStatus(200); // has bread crumb $response->assertSee('
                  '); From 63a6e0754bf9acf7af7b0defb33d7cb9b6b1083a Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 11 Mar 2017 08:00:23 +0100 Subject: [PATCH 054/151] New translations firefly.php (Portuguese, Brazilian) --- resources/lang/pt_BR/firefly.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php index 22164f41de..5240269c54 100644 --- a/resources/lang/pt_BR/firefly.php +++ b/resources/lang/pt_BR/firefly.php @@ -115,13 +115,22 @@ return [ 'multi_select_no_selection' => 'None selected', 'multi_select_all_selected' => 'All selected', 'multi_select_filter_placeholder' => 'Find..', + 'between_dates_breadcrumb' => 'Between :start and :end', 'all_journals_without_budget' => 'All transactions without a budget', - 'all_journals_without_category' => 'All transactions without a category', 'journals_without_budget' => 'Transactions without a budget', + 'all_journals_without_category' => 'All transactions without a category', 'journals_without_category' => 'Transactions without a category', 'all_journals_for_account' => 'All transactions for account :name', 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', 'transferred' => 'Transferred', + 'all_withdrawal' => 'All expenses', + 'title_withdrawal_between' => 'All expenses between :start and :end', + 'all_deposit' => 'All revenue', + 'title_deposit_between' => 'All revenue between :start and :end', + 'all_transfers' => 'All transfers', + 'title_transfers_between' => 'All transfers between :start and :end', + 'all_transfer' => 'All transfers', + 'title_transfer_between' => 'All transfers between :start and :end', // repeat frequencies: From 800e8aca6e75a4b1e84e304ecc63b0d925e9b5fd Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 11 Mar 2017 08:00:27 +0100 Subject: [PATCH 055/151] New translations firefly.php (Polish) --- resources/lang/pl_PL/firefly.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php index 2b16201114..6465e9de2b 100644 --- a/resources/lang/pl_PL/firefly.php +++ b/resources/lang/pl_PL/firefly.php @@ -115,13 +115,22 @@ return [ 'multi_select_no_selection' => 'Nie wybrano', 'multi_select_all_selected' => 'Wybrano wszystko', 'multi_select_filter_placeholder' => 'Find..', + 'between_dates_breadcrumb' => 'Between :start and :end', 'all_journals_without_budget' => 'All transactions without a budget', - 'all_journals_without_category' => 'All transactions without a category', 'journals_without_budget' => 'Transactions without a budget', + 'all_journals_without_category' => 'All transactions without a category', 'journals_without_category' => 'Transactions without a category', 'all_journals_for_account' => 'All transactions for account :name', 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', 'transferred' => 'Transferred', + 'all_withdrawal' => 'All expenses', + 'title_withdrawal_between' => 'All expenses between :start and :end', + 'all_deposit' => 'All revenue', + 'title_deposit_between' => 'All revenue between :start and :end', + 'all_transfers' => 'All transfers', + 'title_transfers_between' => 'All transfers between :start and :end', + 'all_transfer' => 'All transfers', + 'title_transfer_between' => 'All transfers between :start and :end', // repeat frequencies: From 18cb815e4515c5aa4ea728c18d1e3477a7df665f Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 11 Mar 2017 08:00:34 +0100 Subject: [PATCH 056/151] New translations firefly.php (German) --- resources/lang/de_DE/firefly.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php index 368d76a959..e42bd638c3 100644 --- a/resources/lang/de_DE/firefly.php +++ b/resources/lang/de_DE/firefly.php @@ -115,13 +115,22 @@ return [ 'multi_select_no_selection' => 'Nichts ausgewählt', 'multi_select_all_selected' => 'Alle ausgewählt', 'multi_select_filter_placeholder' => 'Suche..', + 'between_dates_breadcrumb' => 'Between :start and :end', 'all_journals_without_budget' => 'All transactions without a budget', - 'all_journals_without_category' => 'All transactions without a category', 'journals_without_budget' => 'Transactions without a budget', + 'all_journals_without_category' => 'All transactions without a category', 'journals_without_category' => 'Transactions without a category', 'all_journals_for_account' => 'All transactions for account :name', 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', 'transferred' => 'Transferred', + 'all_withdrawal' => 'All expenses', + 'title_withdrawal_between' => 'All expenses between :start and :end', + 'all_deposit' => 'All revenue', + 'title_deposit_between' => 'All revenue between :start and :end', + 'all_transfers' => 'All transfers', + 'title_transfers_between' => 'All transfers between :start and :end', + 'all_transfer' => 'All transfers', + 'title_transfer_between' => 'All transfers between :start and :end', // repeat frequencies: From bd8382c005e16853601bbb743c035ce494acc780 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 11 Mar 2017 08:00:45 +0100 Subject: [PATCH 057/151] New translations firefly.php (Spanish) --- resources/lang/es_ES/firefly.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php index 94acef7415..0c4f5a5510 100644 --- a/resources/lang/es_ES/firefly.php +++ b/resources/lang/es_ES/firefly.php @@ -115,13 +115,22 @@ return [ 'multi_select_no_selection' => 'None selected', 'multi_select_all_selected' => 'All selected', 'multi_select_filter_placeholder' => 'Find..', + 'between_dates_breadcrumb' => 'Between :start and :end', 'all_journals_without_budget' => 'All transactions without a budget', - 'all_journals_without_category' => 'All transactions without a category', 'journals_without_budget' => 'Transactions without a budget', + 'all_journals_without_category' => 'All transactions without a category', 'journals_without_category' => 'Transactions without a category', 'all_journals_for_account' => 'All transactions for account :name', 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', 'transferred' => 'Transferred', + 'all_withdrawal' => 'All expenses', + 'title_withdrawal_between' => 'All expenses between :start and :end', + 'all_deposit' => 'All revenue', + 'title_deposit_between' => 'All revenue between :start and :end', + 'all_transfers' => 'All transfers', + 'title_transfers_between' => 'All transfers between :start and :end', + 'all_transfer' => 'All transfers', + 'title_transfer_between' => 'All transfers between :start and :end', // repeat frequencies: From d214e9ff49e86d696d9be80d0f4e39e0d800ea99 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 11 Mar 2017 08:00:50 +0100 Subject: [PATCH 058/151] New translations firefly.php (Dutch) --- resources/lang/nl_NL/firefly.php | 43 +++++++++++++++++++------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php index 9e256898a6..94dbdad1cd 100644 --- a/resources/lang/nl_NL/firefly.php +++ b/resources/lang/nl_NL/firefly.php @@ -115,13 +115,22 @@ return [ 'multi_select_no_selection' => 'Niets geselecteerd', 'multi_select_all_selected' => 'Alles geselecteerd', 'multi_select_filter_placeholder' => 'Vinden..', - 'all_journals_without_budget' => 'All transactions without a budget', - 'all_journals_without_category' => 'All transactions without a category', - 'journals_without_budget' => 'Transactions without a budget', - 'journals_without_category' => 'Transactions without a category', - 'all_journals_for_account' => 'All transactions for account :name', - 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', - 'transferred' => 'Transferred', + 'between_dates_breadcrumb' => 'Between :start and :end', + 'all_journals_without_budget' => 'Alle transacties zonder budget', + 'journals_without_budget' => 'Transacties zonder budget', + 'all_journals_without_category' => 'Alle transacties zonder categorie', + 'journals_without_category' => 'Transacties zonder categorie', + 'all_journals_for_account' => 'Alle transacties voor rekening :name', + 'journals_in_period_for_account' => 'Alle transacties voor rekening :name tussen :start en :end', + 'transferred' => 'Overgeschreven', + 'all_withdrawal' => 'All expenses', + 'title_withdrawal_between' => 'All expenses between :start and :end', + 'all_deposit' => 'All revenue', + 'title_deposit_between' => 'All revenue between :start and :end', + 'all_transfers' => 'All transfers', + 'title_transfers_between' => 'All transfers between :start and :end', + 'all_transfer' => 'All transfers', + 'title_transfer_between' => 'All transfers between :start and :end', // repeat frequencies: @@ -1004,32 +1013,32 @@ return [ 'no_budgets_create_default' => 'Maak een budget', 'no_categories_title_default' => 'Je hebt een categorie nodig!', 'no_categories_intro_default' => 'Je hebt nog geen categorieën. Categorieën gebruik je om je transacties gedetailleerd in te delen.', - 'no_categories_imperative_default' => 'Categories are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:', - 'no_categories_create_default' => 'Create a category', + 'no_categories_imperative_default' => 'Categorieën worden automatisch aangemaakt als je transacties maakt, maar dit kan ook met de hand. Zoals nu:', + 'no_categories_create_default' => 'Maak een categorie', 'no_tags_title_default' => 'Je hebt tags nodig!', - 'no_tags_intro_default' => 'You have no tags yet. Tags are used to fine tune your transactions and label them with specific keywords.', - 'no_tags_imperative_default' => 'Tags are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:', - 'no_tags_create_default' => 'Create a tag', + 'no_tags_intro_default' => 'Je hebt nog geen tags. Tags gebruik je om je transacties te voorzien van specifieke keywords.', + 'no_tags_imperative_default' => 'Tags worden automatisch gemaakt als je ze toevoegt aan een transactie, maar dit kan ook met de hand. Zoals nu:', + 'no_tags_create_default' => 'Maak een tag', 'no_transactions_title_withdrawal' => 'Je hebt uitgaven nodig!', 'no_transactions_intro_withdrawal' => 'You have no expenses yet. You should create expenses to start managing your finances.', 'no_transactions_imperative_withdrawal' => 'Have you spent some money? Then you should write it down:', - 'no_transactions_create_withdrawal' => 'Create an expense', + 'no_transactions_create_withdrawal' => 'Registreer een uitgave', 'no_transactions_title_deposit' => 'Je hebt inkomsten nodig!', 'no_transactions_intro_deposit' => 'You have no recorded income yet. You should create income entries to start managing your finances.', 'no_transactions_imperative_deposit' => 'Have you received some money? Then you should write it down:', - 'no_transactions_create_deposit' => 'Create a deposit', + 'no_transactions_create_deposit' => 'Registreer inkomsten', 'no_transactions_title_transfers' => 'Je hebt overschrijvingen nodig!', 'no_transactions_intro_transfers' => 'You have no transfers yet. When you move money between asset accounts, it is recorded as a transfer.', 'no_transactions_imperative_transfers' => 'Have you moved some money around? Then you should write it down:', - 'no_transactions_create_transfers' => 'Create a transfer', + 'no_transactions_create_transfers' => 'Registreer een overschrijving', 'no_piggies_title_default' => 'Je hebt spaarpotjes nodig!', 'no_piggies_intro_default' => 'You have no piggy banks yet. You can create piggy banks to divide your savings and keep track of what you\'re saving up for.', 'no_piggies_imperative_default' => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:', - 'no_piggies_create_default' => 'Create a new piggy bank', + 'no_piggies_create_default' => 'Maak een spaarpotje', 'no_bills_title_default' => 'Je hebt contracten nodig!', 'no_bills_intro_default' => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent of insurance.', 'no_bills_imperative_default' => 'Do you have such regular bills? Create a bill and keep track of your payments:', - 'no_bills_create_default' => 'Create a bill', + 'no_bills_create_default' => 'Maak een contract', ]; \ No newline at end of file From b88fce35adaec6f44ae3fbe213e15ddf29f37bc8 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 11 Mar 2017 08:00:56 +0100 Subject: [PATCH 059/151] New translations firefly.php (Russian) --- resources/lang/ru_RU/firefly.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/resources/lang/ru_RU/firefly.php b/resources/lang/ru_RU/firefly.php index 94acef7415..0c4f5a5510 100644 --- a/resources/lang/ru_RU/firefly.php +++ b/resources/lang/ru_RU/firefly.php @@ -115,13 +115,22 @@ return [ 'multi_select_no_selection' => 'None selected', 'multi_select_all_selected' => 'All selected', 'multi_select_filter_placeholder' => 'Find..', + 'between_dates_breadcrumb' => 'Between :start and :end', 'all_journals_without_budget' => 'All transactions without a budget', - 'all_journals_without_category' => 'All transactions without a category', 'journals_without_budget' => 'Transactions without a budget', + 'all_journals_without_category' => 'All transactions without a category', 'journals_without_category' => 'Transactions without a category', 'all_journals_for_account' => 'All transactions for account :name', 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', 'transferred' => 'Transferred', + 'all_withdrawal' => 'All expenses', + 'title_withdrawal_between' => 'All expenses between :start and :end', + 'all_deposit' => 'All revenue', + 'title_deposit_between' => 'All revenue between :start and :end', + 'all_transfers' => 'All transfers', + 'title_transfers_between' => 'All transfers between :start and :end', + 'all_transfer' => 'All transfers', + 'title_transfer_between' => 'All transfers between :start and :end', // repeat frequencies: From 03e115e0666c7d9358daca809359446eb52f6c1e Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 11 Mar 2017 08:01:08 +0100 Subject: [PATCH 060/151] New translations firefly.php (Chinese Traditional, Hong Kong) --- resources/lang/zh_HK/firefly.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/resources/lang/zh_HK/firefly.php b/resources/lang/zh_HK/firefly.php index 94acef7415..0c4f5a5510 100644 --- a/resources/lang/zh_HK/firefly.php +++ b/resources/lang/zh_HK/firefly.php @@ -115,13 +115,22 @@ return [ 'multi_select_no_selection' => 'None selected', 'multi_select_all_selected' => 'All selected', 'multi_select_filter_placeholder' => 'Find..', + 'between_dates_breadcrumb' => 'Between :start and :end', 'all_journals_without_budget' => 'All transactions without a budget', - 'all_journals_without_category' => 'All transactions without a category', 'journals_without_budget' => 'Transactions without a budget', + 'all_journals_without_category' => 'All transactions without a category', 'journals_without_category' => 'Transactions without a category', 'all_journals_for_account' => 'All transactions for account :name', 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', 'transferred' => 'Transferred', + 'all_withdrawal' => 'All expenses', + 'title_withdrawal_between' => 'All expenses between :start and :end', + 'all_deposit' => 'All revenue', + 'title_deposit_between' => 'All revenue between :start and :end', + 'all_transfers' => 'All transfers', + 'title_transfers_between' => 'All transfers between :start and :end', + 'all_transfer' => 'All transfers', + 'title_transfer_between' => 'All transfers between :start and :end', // repeat frequencies: From c70df01532c188f4972e2f0797e995c7770f7b5b Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 11 Mar 2017 08:01:13 +0100 Subject: [PATCH 061/151] New translations firefly.php (Croatian) --- resources/lang/hr_HR/firefly.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/resources/lang/hr_HR/firefly.php b/resources/lang/hr_HR/firefly.php index 94acef7415..0c4f5a5510 100644 --- a/resources/lang/hr_HR/firefly.php +++ b/resources/lang/hr_HR/firefly.php @@ -115,13 +115,22 @@ return [ 'multi_select_no_selection' => 'None selected', 'multi_select_all_selected' => 'All selected', 'multi_select_filter_placeholder' => 'Find..', + 'between_dates_breadcrumb' => 'Between :start and :end', 'all_journals_without_budget' => 'All transactions without a budget', - 'all_journals_without_category' => 'All transactions without a category', 'journals_without_budget' => 'Transactions without a budget', + 'all_journals_without_category' => 'All transactions without a category', 'journals_without_category' => 'Transactions without a category', 'all_journals_for_account' => 'All transactions for account :name', 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', 'transferred' => 'Transferred', + 'all_withdrawal' => 'All expenses', + 'title_withdrawal_between' => 'All expenses between :start and :end', + 'all_deposit' => 'All revenue', + 'title_deposit_between' => 'All revenue between :start and :end', + 'all_transfers' => 'All transfers', + 'title_transfers_between' => 'All transfers between :start and :end', + 'all_transfer' => 'All transfers', + 'title_transfer_between' => 'All transfers between :start and :end', // repeat frequencies: From f5ad569abac37268c5019205f4b2ebe045bcc7fe Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 11 Mar 2017 08:01:20 +0100 Subject: [PATCH 062/151] New translations firefly.php (Chinese Traditional) --- resources/lang/zh_TW/firefly.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php index 7a04e49f99..c2f79ab4bf 100644 --- a/resources/lang/zh_TW/firefly.php +++ b/resources/lang/zh_TW/firefly.php @@ -115,13 +115,22 @@ return [ 'multi_select_no_selection' => 'None selected', 'multi_select_all_selected' => 'All selected', 'multi_select_filter_placeholder' => 'Find..', + 'between_dates_breadcrumb' => 'Between :start and :end', 'all_journals_without_budget' => 'All transactions without a budget', - 'all_journals_without_category' => 'All transactions without a category', 'journals_without_budget' => 'Transactions without a budget', + 'all_journals_without_category' => 'All transactions without a category', 'journals_without_category' => 'Transactions without a category', 'all_journals_for_account' => 'All transactions for account :name', 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', 'transferred' => 'Transferred', + 'all_withdrawal' => 'All expenses', + 'title_withdrawal_between' => 'All expenses between :start and :end', + 'all_deposit' => 'All revenue', + 'title_deposit_between' => 'All revenue between :start and :end', + 'all_transfers' => 'All transfers', + 'title_transfers_between' => 'All transfers between :start and :end', + 'all_transfer' => 'All transfers', + 'title_transfer_between' => 'All transfers between :start and :end', // repeat frequencies: From 298f0c194d839a2d7f30476e04d8ba1adeca8d64 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 11 Mar 2017 08:01:29 +0100 Subject: [PATCH 063/151] New translations firefly.php (French) --- resources/lang/fr_FR/firefly.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php index 88785a47f4..620676f0b9 100644 --- a/resources/lang/fr_FR/firefly.php +++ b/resources/lang/fr_FR/firefly.php @@ -115,13 +115,22 @@ return [ 'multi_select_no_selection' => 'None selected', 'multi_select_all_selected' => 'All selected', 'multi_select_filter_placeholder' => 'Find..', + 'between_dates_breadcrumb' => 'Between :start and :end', 'all_journals_without_budget' => 'All transactions without a budget', - 'all_journals_without_category' => 'All transactions without a category', 'journals_without_budget' => 'Transactions without a budget', + 'all_journals_without_category' => 'All transactions without a category', 'journals_without_category' => 'Transactions without a category', 'all_journals_for_account' => 'All transactions for account :name', 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', 'transferred' => 'Transferred', + 'all_withdrawal' => 'All expenses', + 'title_withdrawal_between' => 'All expenses between :start and :end', + 'all_deposit' => 'All revenue', + 'title_deposit_between' => 'All revenue between :start and :end', + 'all_transfers' => 'All transfers', + 'title_transfers_between' => 'All transfers between :start and :end', + 'all_transfer' => 'All transfers', + 'title_transfer_between' => 'All transfers between :start and :end', // repeat frequencies: From a34c285820eaae536716b12078499d98f119d201 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 11 Mar 2017 12:00:19 +0100 Subject: [PATCH 064/151] New translations demo.php (French) --- resources/lang/fr_FR/demo.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/lang/fr_FR/demo.php b/resources/lang/fr_FR/demo.php index e7f8ea934d..c81ae87850 100644 --- a/resources/lang/fr_FR/demo.php +++ b/resources/lang/fr_FR/demo.php @@ -8,8 +8,8 @@ */ return [ - 'no_demo_text' => 'Sorry, there is no extra demo-explanation text for this page.', - 'see_help_icon' => 'However, the -icon in the top right corner may tell you more.', + 'no_demo_text' => 'Désolé, il n’y a aucun texte supplémentaire démo-explication pour cette page.', + 'see_help_icon' => 'Cependant, l\'icône - dans le coin supérieur droit peut vous en dire plus.', 'index' => 'Welcome to Firefly III! On this page you get a quick overview of your finances. For more information, check out Accounts → Asset Accounts and of course the Budgets and Reports pages. Or just take a look around and see where you end up.', 'accounts-index' => 'Asset accounts are your personal bank accounts. Expense accounts are the accounts you spend money at, such as stores and friends. Revenue accounts are accounts you receive money from, such as your job, the government or other sources of income. On this page you can edit or remove them.', 'budgets-index' => 'This page shows you an overview of your budgets. The top bar shows the amount that is available to be budgeted. This can be customized for any period by clicking the amount on the right. The amount you\'ve actually spent is shown in the bar below. Below that are the expenses per budget and what you\'ve budgeted for them.', From be1b64bb7842c3b193ebd742fba06a4930f06ed3 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 11 Mar 2017 12:10:17 +0100 Subject: [PATCH 065/151] New translations demo.php (French) --- resources/lang/fr_FR/demo.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/lang/fr_FR/demo.php b/resources/lang/fr_FR/demo.php index c81ae87850..3702027c08 100644 --- a/resources/lang/fr_FR/demo.php +++ b/resources/lang/fr_FR/demo.php @@ -10,15 +10,15 @@ return [ 'no_demo_text' => 'Désolé, il n’y a aucun texte supplémentaire démo-explication pour cette page.', 'see_help_icon' => 'Cependant, l\'icône - dans le coin supérieur droit peut vous en dire plus.', - 'index' => 'Welcome to Firefly III! On this page you get a quick overview of your finances. For more information, check out Accounts → Asset Accounts and of course the Budgets and Reports pages. Or just take a look around and see where you end up.', + 'index' => 'Bienvenue chez Firefly III ! Sur cette page, vous obtenez un aperçu rapide de vos finances. Pour plus d’informations, consultez comptes → Comptes d’actif et, bien sûr, les pages des Budgets et des rapports. Ou juste jetez un coup d’œil et voyez où vous vous retrouvez.', 'accounts-index' => 'Asset accounts are your personal bank accounts. Expense accounts are the accounts you spend money at, such as stores and friends. Revenue accounts are accounts you receive money from, such as your job, the government or other sources of income. On this page you can edit or remove them.', 'budgets-index' => 'This page shows you an overview of your budgets. The top bar shows the amount that is available to be budgeted. This can be customized for any period by clicking the amount on the right. The amount you\'ve actually spent is shown in the bar below. Below that are the expenses per budget and what you\'ve budgeted for them.', 'reports-index-start' => 'Firefly III supports four types of reports. Read about them by clicking on the -icon in the top right corner.', 'reports-index-examples' => 'Be sure to check out these examples: a monthly financial overview, a yearly financial overview and a budget overview.', 'currencies-index' => 'Firefly III supports multiple currencies. Although it defaults to the Euro it can be set to the US Dollar and many other currencies. As you can see a small selection of currencies has been included but you can add your own if you wish to. Changing the default currency will not change the currency of existing transactions however: Firefly III supports the use of multiple currencies at the same time.', 'transactions-index' => 'These expenses, deposits and transfers are not particularly imaginative. They have been generated automatically.', - 'piggy-banks-index' => 'As you can see, there are three piggy banks. Use the plus and minus buttons to influence the amount of money in each piggy bank. Click the name of the piggy bank to see the administration for each piggy bank.', - 'import-index' => 'Of course, any CSV file can be imported into Firefly III ', - 'import-configure-security' => 'Because of security concerns, your upload has been replaced with a local file.', - 'import-configure-configuration' => 'The configuration you see below is correct for the local file.', + 'piggy-banks-index' => 'Comme vous pouvez le voir, il y a trois tirelires. Utilisez les boutons plus et moins pour influer sur le montant d’argent dans chaque tirelire. Cliquez sur le nom de la tirelire pour voir l’administration pour chaque tirelire.', + 'import-index' => 'Bien sûr, n’importe quel fichier CSV peut être importé dans Firefly III ', + 'import-configure-security' => 'Pour des raisons de sécurité, votre téléchargement a été remplacé par un fichier local.', + 'import-configure-configuration' => 'La configuration que vous voyez ci-dessous est correcte pour le fichier local.', ]; \ No newline at end of file From 8f14c78ba188af974b029c8487d9a340122ff682 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 11 Mar 2017 22:28:51 +0100 Subject: [PATCH 066/151] Expand some tests. --- .../Controllers/Chart/AccountController.php | 5 +- .../Controllers/Admin/UserControllerTest.php | 15 +++- .../Chart/AccountControllerTest.php | 87 +++++++++++++++++++ 3 files changed, 102 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php index 7896f5ed94..1f22e7f32d 100644 --- a/app/Http/Controllers/Chart/AccountController.php +++ b/app/Http/Controllers/Chart/AccountController.php @@ -61,15 +61,12 @@ class AccountController extends Controller */ public function all(Account $account) { - $cache = new CacheProperties(); + $cache = new CacheProperties; $cache->addProperty('chart.account.all'); $cache->addProperty($account->id); if ($cache->has()) { - Log::debug('Return chart.account.all from cache.'); - return Response::json($cache->get()); // @codeCoverageIgnore } - Log::debug('Regenerate chart.account.all from scratch.'); /** @var AccountRepositoryInterface $repository */ $repository = app(AccountRepositoryInterface::class); diff --git a/tests/Feature/Controllers/Admin/UserControllerTest.php b/tests/Feature/Controllers/Admin/UserControllerTest.php index 0d6701be4a..1e52c7e17a 100644 --- a/tests/Feature/Controllers/Admin/UserControllerTest.php +++ b/tests/Feature/Controllers/Admin/UserControllerTest.php @@ -12,6 +12,10 @@ declare(strict_types = 1); namespace Tests\Feature\Controllers\Admin; +use FireflyIII\Models\Preference; +use FireflyIII\Repositories\User\UserRepositoryInterface; +use FireflyIII\Support\Facades\Preferences; +use Illuminate\Support\Collection; use Tests\TestCase; class UserControllerTest extends TestCase @@ -21,6 +25,8 @@ class UserControllerTest extends TestCase */ public function testEdit() { + $repository = $this->mock(UserRepositoryInterface::class); + $this->be($this->user()); $response = $this->get(route('admin.users.edit', [1])); $response->assertStatus(200); @@ -34,7 +40,11 @@ class UserControllerTest extends TestCase */ public function testIndex() { - $this->be($this->user()); + $repository = $this->mock(UserRepositoryInterface::class); + $user = $this->user(); + $repository->shouldReceive('all')->andReturn(new Collection([$user])); + + $this->be($user); $response = $this->get(route('admin.users')); $response->assertStatus(200); // has bread crumb @@ -46,6 +56,9 @@ class UserControllerTest extends TestCase */ public function testShow() { + $repository = $this->mock(UserRepositoryInterface::class); + $repository->shouldReceive('getUserData')->andReturn([]); + $this->be($this->user()); $response = $this->get(route('admin.users.edit', [1])); $response->assertStatus(200); diff --git a/tests/Feature/Controllers/Chart/AccountControllerTest.php b/tests/Feature/Controllers/Chart/AccountControllerTest.php index d79f1cf9d5..24d2247b4d 100644 --- a/tests/Feature/Controllers/Chart/AccountControllerTest.php +++ b/tests/Feature/Controllers/Chart/AccountControllerTest.php @@ -12,6 +12,16 @@ declare(strict_types = 1); namespace Tests\Feature\Controllers\Chart; +use Carbon\Carbon; +use FireflyIII\Generator\Chart\Basic\GeneratorInterface; +use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Models\AccountType; +use FireflyIII\Models\TransactionType; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; +use FireflyIII\Repositories\Category\CategoryRepositoryInterface; +use Illuminate\Support\Collection; +use Steam; use Tests\TestCase; class AccountControllerTest extends TestCase @@ -25,6 +35,14 @@ class AccountControllerTest extends TestCase */ public function testExpenseAccounts(string $range) { + $generator = $this->mock(GeneratorInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + + $accountRepos->shouldReceive('getAccountsByType')->withArgs([[AccountType::EXPENSE, AccountType::BENEFICIARY]])->andReturn(new Collection); + $generator->shouldReceive('singleSet')->andReturn([]); + Steam::shouldReceive('balancesById')->twice()->andReturn([]); + + $this->be($this->user()); $this->changeDateRange($this->user(), $range); $response = $this->get(route('chart.account.expense')); @@ -33,12 +51,26 @@ class AccountControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Chart\AccountController::expenseBudget + * @covers \FireflyIII\Http\Controllers\Chart\AccountController::getBudgetNames * @dataProvider dateRangeProvider * * @param string $range */ public function testExpenseBudget(string $range) { + $generator = $this->mock(GeneratorInterface::class); + $collector = $this->mock(JournalCollectorInterface::class); + $budgetRepos = $this->mock(BudgetRepositoryInterface::class); + + $collector->shouldReceive('setAccounts')->andReturnSelf(); + $collector->shouldReceive('setRange')->andReturnSelf(); + $collector->shouldReceive('withBudgetInformation')->andReturnSelf(); + $collector->shouldReceive('setTypes')->withArgs([[TransactionType::WITHDRAWAL]])->andReturnSelf(); + $collector->shouldReceive('getJournals')->andReturn(new Collection); + $generator->shouldReceive('pieChart')->andReturn([]); + $budgetRepos->shouldReceive('getBudgets')->andReturn(new Collection); + + $this->be($this->user()); $this->changeDateRange($this->user(), $range); $response = $this->get(route('chart.account.expense-budget', [1, '20120101', '20120131'])); @@ -53,6 +85,18 @@ class AccountControllerTest extends TestCase */ public function testExpenseCategory(string $range) { + $generator = $this->mock(GeneratorInterface::class); + $collector = $this->mock(JournalCollectorInterface::class); + $categoryRepos = $this->mock(CategoryRepositoryInterface::class); + + $collector->shouldReceive('setAccounts')->andReturnSelf(); + $collector->shouldReceive('setRange')->andReturnSelf(); + $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); + $collector->shouldReceive('setTypes')->withArgs([[TransactionType::WITHDRAWAL]])->andReturnSelf(); + $collector->shouldReceive('getJournals')->andReturn(new Collection); + $generator->shouldReceive('pieChart')->andReturn([]); + $categoryRepos->shouldReceive('getCategories')->andReturn(new Collection); + $this->be($this->user()); $this->changeDateRange($this->user(), $range); $response = $this->get(route('chart.account.expense-category', [1, '20120101', '20120131'])); @@ -70,6 +114,14 @@ class AccountControllerTest extends TestCase */ public function testFrontpage(string $range) { + $generator = $this->mock(GeneratorInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + + $accountRepos->shouldReceive('getAccountsByType')->withArgs([[AccountType::DEFAULT, AccountType::ASSET]])->andReturn(new Collection); + $accountRepos->shouldReceive('getAccountsById')->andReturn(new Collection); + Steam::shouldReceive('balanceInRange')->andReturn([]); + $generator->shouldReceive('multiSet')->andReturn([]); + $this->be($this->user()); $this->changeDateRange($this->user(), $range); $response = $this->get(route('chart.account.frontpage')); @@ -84,6 +136,18 @@ class AccountControllerTest extends TestCase */ public function testIncomeCategory(string $range) { + $generator = $this->mock(GeneratorInterface::class); + $collector = $this->mock(JournalCollectorInterface::class); + $categoryRepos = $this->mock(CategoryRepositoryInterface::class); + + $collector->shouldReceive('setAccounts')->andReturnSelf(); + $collector->shouldReceive('setRange')->andReturnSelf(); + $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); + $collector->shouldReceive('setTypes')->withArgs([[TransactionType::DEPOSIT]])->andReturnSelf(); + $collector->shouldReceive('getJournals')->andReturn(new Collection); + $generator->shouldReceive('pieChart')->andReturn([]); + $categoryRepos->shouldReceive('getCategories')->andReturn(new Collection); + $this->be($this->user()); $this->changeDateRange($this->user(), $range); $response = $this->get(route('chart.account.income-category', [1, '20120101', '20120131'])); @@ -98,6 +162,13 @@ class AccountControllerTest extends TestCase */ public function testPeriod(string $range) { + $generator = $this->mock(GeneratorInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + + $accountRepos->shouldReceive('oldestJournalDate')->andReturn(new Carbon); + Steam::shouldReceive('balanceInRange')->andReturn(['2012-01-01' => '0']); + $generator->shouldReceive('singleSet')->andReturn([]); + $this->be($this->user()); $this->changeDateRange($this->user(), $range); $response = $this->get(route('chart.account.period', [1, '2012-01-01'])); @@ -106,9 +177,13 @@ class AccountControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Chart\AccountController::report + * @covers \FireflyIII\Http\Controllers\Chart\AccountController::accountBalanceChart */ public function testReport() { + $generator = $this->mock(GeneratorInterface::class); + $generator->shouldReceive('multiSet')->andreturn([]); + $this->be($this->user()); $response = $this->get(route('chart.account.report', ['1', '20120101', '20120131'])); $response->assertStatus(200); @@ -122,6 +197,13 @@ class AccountControllerTest extends TestCase */ public function testRevenueAccounts(string $range) { + $generator = $this->mock(GeneratorInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + + $accountRepos->shouldReceive('getAccountsByType')->withArgs([[AccountType::REVENUE]])->andReturn(new Collection); + $generator->shouldReceive('singleSet')->andReturn([]); + Steam::shouldReceive('balancesById')->twice()->andReturn([]); + $this->be($this->user()); $this->changeDateRange($this->user(), $range); $response = $this->get(route('chart.account.revenue')); @@ -136,6 +218,11 @@ class AccountControllerTest extends TestCase */ public function testSingle(string $range) { + $generator = $this->mock(GeneratorInterface::class); + + Steam::shouldReceive('balanceInRange')->andReturn(['2012-01-01' => '0']); + $generator->shouldReceive('singleSet')->andReturn([]); + $this->be($this->user()); $this->changeDateRange($this->user(), $range); $response = $this->get(route('chart.account.single', [1])); From 65dbfcba5c0f1c9de6c13eefc614cfb003992ba9 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 12 Mar 2017 08:38:13 +0100 Subject: [PATCH 067/151] Expand tests. --- database/factories/ModelFactory.php | 15 ++++- .../Chart/AccountControllerTest.php | 22 +++---- .../Controllers/Chart/BillControllerTest.php | 21 ++++++- .../Chart/BudgetControllerTest.php | 62 +++++++++++++++++-- 4 files changed, 102 insertions(+), 18 deletions(-) diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php index 846f775566..24113ceab8 100644 --- a/database/factories/ModelFactory.php +++ b/database/factories/ModelFactory.php @@ -36,7 +36,7 @@ $factory->define( $factory->define( FireflyIII\Models\Tag::class, function (Faker\Generator $faker) { return [ - 'id' => $faker->numberBetween(1, 10), + 'id' => $faker->numberBetween(1, 10), 'tag' => $faker->words(1, true), ]; } @@ -60,6 +60,19 @@ $factory->define( } ); +$factory->define( + FireflyIII\Models\BudgetLimit::class, function (Faker\Generator $faker) { + return [ + 'id' => $faker->numberBetween(1, 10), + 'start_date' => '2017-01-01', + 'end_date' => '2017-01-31', + 'amount' => '300', + 'budget_id' => $faker->numberBetween(1, 6), + + ]; +} +); + $factory->define( FireflyIII\Models\Account::class, function (Faker\Generator $faker) { return [ diff --git a/tests/Feature/Controllers/Chart/AccountControllerTest.php b/tests/Feature/Controllers/Chart/AccountControllerTest.php index 24d2247b4d..718b86aba6 100644 --- a/tests/Feature/Controllers/Chart/AccountControllerTest.php +++ b/tests/Feature/Controllers/Chart/AccountControllerTest.php @@ -58,9 +58,9 @@ class AccountControllerTest extends TestCase */ public function testExpenseBudget(string $range) { - $generator = $this->mock(GeneratorInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); - $budgetRepos = $this->mock(BudgetRepositoryInterface::class); + $generator = $this->mock(GeneratorInterface::class); + $collector = $this->mock(JournalCollectorInterface::class); + $budgetRepos = $this->mock(BudgetRepositoryInterface::class); $collector->shouldReceive('setAccounts')->andReturnSelf(); $collector->shouldReceive('setRange')->andReturnSelf(); @@ -114,8 +114,8 @@ class AccountControllerTest extends TestCase */ public function testFrontpage(string $range) { - $generator = $this->mock(GeneratorInterface::class); - $accountRepos = $this->mock(AccountRepositoryInterface::class); + $generator = $this->mock(GeneratorInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); $accountRepos->shouldReceive('getAccountsByType')->withArgs([[AccountType::DEFAULT, AccountType::ASSET]])->andReturn(new Collection); $accountRepos->shouldReceive('getAccountsById')->andReturn(new Collection); @@ -162,8 +162,8 @@ class AccountControllerTest extends TestCase */ public function testPeriod(string $range) { - $generator = $this->mock(GeneratorInterface::class); - $accountRepos = $this->mock(AccountRepositoryInterface::class); + $generator = $this->mock(GeneratorInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); $accountRepos->shouldReceive('oldestJournalDate')->andReturn(new Carbon); Steam::shouldReceive('balanceInRange')->andReturn(['2012-01-01' => '0']); @@ -181,7 +181,7 @@ class AccountControllerTest extends TestCase */ public function testReport() { - $generator = $this->mock(GeneratorInterface::class); + $generator = $this->mock(GeneratorInterface::class); $generator->shouldReceive('multiSet')->andreturn([]); $this->be($this->user()); @@ -197,8 +197,8 @@ class AccountControllerTest extends TestCase */ public function testRevenueAccounts(string $range) { - $generator = $this->mock(GeneratorInterface::class); - $accountRepos = $this->mock(AccountRepositoryInterface::class); + $generator = $this->mock(GeneratorInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); $accountRepos->shouldReceive('getAccountsByType')->withArgs([[AccountType::REVENUE]])->andReturn(new Collection); $generator->shouldReceive('singleSet')->andReturn([]); @@ -218,7 +218,7 @@ class AccountControllerTest extends TestCase */ public function testSingle(string $range) { - $generator = $this->mock(GeneratorInterface::class); + $generator = $this->mock(GeneratorInterface::class); Steam::shouldReceive('balanceInRange')->andReturn(['2012-01-01' => '0']); $generator->shouldReceive('singleSet')->andReturn([]); diff --git a/tests/Feature/Controllers/Chart/BillControllerTest.php b/tests/Feature/Controllers/Chart/BillControllerTest.php index eb0f99733f..59c8e8efd6 100644 --- a/tests/Feature/Controllers/Chart/BillControllerTest.php +++ b/tests/Feature/Controllers/Chart/BillControllerTest.php @@ -12,9 +12,12 @@ declare(strict_types = 1); namespace Tests\Feature\Controllers\Chart; +use FireflyIII\Generator\Chart\Basic\GeneratorInterface; +use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Repositories\Bill\BillRepositoryInterface; +use Illuminate\Support\Collection; use Tests\TestCase; - class BillControllerTest extends TestCase { /** @@ -26,6 +29,13 @@ class BillControllerTest extends TestCase */ public function testFrontpage(string $range) { + $generator = $this->mock(GeneratorInterface::class); + $repository = $this->mock(BillRepositoryInterface::class); + + $repository->shouldReceive('getBillsPaidInRange')->once()->andReturn('-1'); + $repository->shouldReceive('getBillsUnpaidInRange')->once()->andReturn('2'); + $generator->shouldReceive('pieChart')->once()->andReturn([]); + $this->be($this->user()); $this->changeDateRange($this->user(), $range); $response = $this->get(route('chart.bill.frontpage')); @@ -37,6 +47,15 @@ class BillControllerTest extends TestCase */ public function testSingle() { + $generator = $this->mock(GeneratorInterface::class); + $collector = $this->mock(JournalCollectorInterface::class); + + $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf()->once(); + $collector->shouldReceive('setBills')->andReturnSelf()->once(); + $collector->shouldReceive('getJournals')->andReturn(new Collection)->once(); + + $generator->shouldReceive('multiSet')->once()->andReturn([]); + $this->be($this->user()); $response = $this->get(route('chart.bill.single', [1])); $response->assertStatus(200); diff --git a/tests/Feature/Controllers/Chart/BudgetControllerTest.php b/tests/Feature/Controllers/Chart/BudgetControllerTest.php index a80540d41a..079d90820c 100644 --- a/tests/Feature/Controllers/Chart/BudgetControllerTest.php +++ b/tests/Feature/Controllers/Chart/BudgetControllerTest.php @@ -13,7 +13,13 @@ namespace Tests\Feature\Controllers\Chart; use Carbon\Carbon; +use FireflyIII\Generator\Chart\Basic\GeneratorInterface; +use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Models\Budget; +use FireflyIII\Models\BudgetLimit; +use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; +use Illuminate\Support\Collection; use Tests\TestCase; class BudgetControllerTest extends TestCase @@ -28,9 +34,12 @@ class BudgetControllerTest extends TestCase */ public function testBudget(string $range) { - $budgetRepository = $this->mock(BudgetRepositoryInterface::class); - $budgetRepository->shouldReceive('firstUseDate')->andReturn(new Carbon('2015-01-01')); - $budgetRepository->shouldReceive('spentInPeriod')->andReturn('-100'); + $repository = $this->mock(BudgetRepositoryInterface::class); + $generator = $this->mock(GeneratorInterface::class); + + $repository->shouldReceive('firstUseDate')->andReturn(new Carbon('2015-01-01'))->once(); + $repository->shouldReceive('spentInPeriod')->andReturn('-100'); + $generator->shouldReceive('singleSet')->andReturn([])->once(); $this->be($this->user()); @@ -47,8 +56,12 @@ class BudgetControllerTest extends TestCase */ public function testBudgetLimit(string $range) { - $budgetRepository = $this->mock(BudgetRepositoryInterface::class); - $budgetRepository->shouldReceive('spentInPeriod')->andReturn('-100'); + $repository = $this->mock(BudgetRepositoryInterface::class); + $generator = $this->mock(GeneratorInterface::class); + + + $repository->shouldReceive('spentInPeriod')->andReturn('-100'); + $generator->shouldReceive('singleSet')->once()->andReturn([]); $this->be($this->user()); $this->changeDateRange($this->user(), $range); @@ -58,12 +71,33 @@ class BudgetControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Chart\BudgetController::frontpage + * @covers \FireflyIII\Http\Controllers\Chart\BudgetController::getExpensesForBudget + * @covers \FireflyIII\Http\Controllers\Chart\BudgetController::spentInPeriodWithout * @dataProvider dateRangeProvider * * @param string $range */ public function testFrontpage(string $range) { + $repository = $this->mock(BudgetRepositoryInterface::class); + $generator = $this->mock(GeneratorInterface::class); + $collector = $this->mock(JournalCollectorInterface::class); + $budget = factory(Budget::class)->make(); + $budgetLimit = factory(BudgetLimit::class)->make(); + $budgetLimit->budget_id = $budget->id; + + $repository->shouldReceive('getActiveBudgets')->andReturn(new Collection([$budget])); + $repository->shouldReceive('getBudgetLimits')->once()->andReturn(new Collection([$budgetLimit])); + $repository->shouldReceive('spentInPeriod')->andReturn('-100'); + + $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); + $collector->shouldReceive('setTypes')->withArgs([[TransactionType::WITHDRAWAL]])->andReturnSelf(); + $collector->shouldReceive('setRange')->andReturnSelf(); + $collector->shouldReceive('withoutBudget')->andReturnSelf(); + $collector->shouldReceive('getJournals')->andReturn(new Collection); + + $generator->shouldReceive('multiSet')->once()->andReturn([]); + $this->be($this->user()); $this->changeDateRange($this->user(), $range); $response = $this->get(route('chart.budget.frontpage')); @@ -72,9 +106,21 @@ class BudgetControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Chart\BudgetController::period + * @covers \FireflyIII\Http\Controllers\Chart\BudgetController::getBudgetedInPeriod */ public function testPeriod() { + $repository = $this->mock(BudgetRepositoryInterface::class); + $generator = $this->mock(GeneratorInterface::class); + $budget = factory(Budget::class)->make(); + $budgetLimit = factory(BudgetLimit::class)->make(); + $budgetLimit->budget_id = $budget->id; + + $repository->shouldReceive('getBudgetPeriodReport')->andReturn([])->once(); + $repository->shouldReceive('getBudgetLimits')->andReturn(new Collection([$budgetLimit])); + $generator->shouldReceive('multiSet')->once()->andReturn([]); + + $this->be($this->user()); $response = $this->get(route('chart.budget.period', [1, '1', '20120101', '20120131'])); $response->assertStatus(200); @@ -85,6 +131,12 @@ class BudgetControllerTest extends TestCase */ public function testPeriodNoBudget() { + $repository = $this->mock(BudgetRepositoryInterface::class); + $generator = $this->mock(GeneratorInterface::class); + + $repository->shouldReceive('getNoBudgetPeriodReport')->andReturn([])->once(); + $generator->shouldReceive('singleSet')->once()->andReturn([]); + $this->be($this->user()); $response = $this->get(route('chart.budget.period.no-budget', ['1', '20120101', '20120131'])); $response->assertStatus(200); From b67dfeced22bee713ed96daaaea2912fcbbc9fd1 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 12 Mar 2017 09:22:33 +0100 Subject: [PATCH 068/151] Expand tests. --- .../Chart/CategoryReportController.php | 7 +- database/factories/ModelFactory.php | 12 +++ .../Admin/ConfigurationControllerTest.php | 5 ++ .../Controllers/Admin/HomeControllerTest.php | 5 ++ .../Controllers/Admin/UserControllerTest.php | 7 +- .../Auth/TwoFactorControllerTest.php | 5 ++ .../Chart/AccountControllerTest.php | 5 ++ .../Controllers/Chart/BillControllerTest.php | 5 ++ .../Chart/BudgetControllerTest.php | 5 ++ .../Chart/CategoryControllerTest.php | 89 +++++++++++++------ .../Chart/CategoryReportControllerTest.php | 70 +++++++++++++++ .../Chart/PiggyBankControllerTest.php | 16 ++++ .../Chart/ReportControllerTest.php | 30 +++++++ 13 files changed, 226 insertions(+), 35 deletions(-) diff --git a/app/Http/Controllers/Chart/CategoryReportController.php b/app/Http/Controllers/Chart/CategoryReportController.php index b10c193e1d..7703725bfe 100644 --- a/app/Http/Controllers/Chart/CategoryReportController.php +++ b/app/Http/Controllers/Chart/CategoryReportController.php @@ -78,11 +78,8 @@ class CategoryReportController extends Controller { /** @var MetaPieChartInterface $helper */ $helper = app(MetaPieChartInterface::class); - $helper->setAccounts($accounts); - $helper->setCategories($categories); - $helper->setStart($start); - $helper->setEnd($end); - $helper->setCollectOtherObjects(intval($others) === 1); + $helper->setAccounts($accounts)->setCategories($categories)->setStart($start)->setEnd($end)->setCollectOtherObjects(intval($others) === 1); + $chartData = $helper->generate('expense', 'account'); $data = $this->generator->pieChart($chartData); diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php index 24113ceab8..85729c895c 100644 --- a/database/factories/ModelFactory.php +++ b/database/factories/ModelFactory.php @@ -60,6 +60,18 @@ $factory->define( } ); +$factory->define( + FireflyIII\Models\PiggyBankEvent::class, function (Faker\Generator $faker) { + return [ + 'id' => $faker->numberBetween(1, 10), + 'piggy_bank_id' => $faker->numberBetween(1, 10), + 'transaction_journal_id' => $faker->numberBetween(1, 10), + 'date' => $faker->date('Y-m-d'), + 'amount' => '100', + ]; +} +); + $factory->define( FireflyIII\Models\BudgetLimit::class, function (Faker\Generator $faker) { return [ diff --git a/tests/Feature/Controllers/Admin/ConfigurationControllerTest.php b/tests/Feature/Controllers/Admin/ConfigurationControllerTest.php index 5d7c0e9b4e..44bad78766 100644 --- a/tests/Feature/Controllers/Admin/ConfigurationControllerTest.php +++ b/tests/Feature/Controllers/Admin/ConfigurationControllerTest.php @@ -16,6 +16,11 @@ use FireflyConfig; use FireflyIII\Models\Configuration; use Tests\TestCase; +/** + * Class ConfigurationControllerTest + * + * @package Tests\Feature\Controllers\Admin + */ class ConfigurationControllerTest extends TestCase { diff --git a/tests/Feature/Controllers/Admin/HomeControllerTest.php b/tests/Feature/Controllers/Admin/HomeControllerTest.php index 10bd26ecd4..b31d833ff4 100644 --- a/tests/Feature/Controllers/Admin/HomeControllerTest.php +++ b/tests/Feature/Controllers/Admin/HomeControllerTest.php @@ -13,6 +13,11 @@ namespace Tests\Feature\Controllers\Admin; use Tests\TestCase; +/** + * Class HomeControllerTest + * + * @package Tests\Feature\Controllers\Admin + */ class HomeControllerTest extends TestCase { diff --git a/tests/Feature/Controllers/Admin/UserControllerTest.php b/tests/Feature/Controllers/Admin/UserControllerTest.php index 1e52c7e17a..f94977460a 100644 --- a/tests/Feature/Controllers/Admin/UserControllerTest.php +++ b/tests/Feature/Controllers/Admin/UserControllerTest.php @@ -18,6 +18,11 @@ use FireflyIII\Support\Facades\Preferences; use Illuminate\Support\Collection; use Tests\TestCase; +/** + * Class UserControllerTest + * + * @package Tests\Feature\Controllers\Admin + */ class UserControllerTest extends TestCase { /** @@ -25,8 +30,6 @@ class UserControllerTest extends TestCase */ public function testEdit() { - $repository = $this->mock(UserRepositoryInterface::class); - $this->be($this->user()); $response = $this->get(route('admin.users.edit', [1])); $response->assertStatus(200); diff --git a/tests/Feature/Controllers/Auth/TwoFactorControllerTest.php b/tests/Feature/Controllers/Auth/TwoFactorControllerTest.php index 8257233692..b1882647e2 100644 --- a/tests/Feature/Controllers/Auth/TwoFactorControllerTest.php +++ b/tests/Feature/Controllers/Auth/TwoFactorControllerTest.php @@ -16,6 +16,11 @@ use FireflyIII\Models\Preference; use Preferences; use Tests\TestCase; +/** + * Class TwoFactorControllerTest + * + * @package Tests\Feature\Controllers\Auth + */ class TwoFactorControllerTest extends TestCase { /** diff --git a/tests/Feature/Controllers/Chart/AccountControllerTest.php b/tests/Feature/Controllers/Chart/AccountControllerTest.php index 718b86aba6..a6468fef80 100644 --- a/tests/Feature/Controllers/Chart/AccountControllerTest.php +++ b/tests/Feature/Controllers/Chart/AccountControllerTest.php @@ -24,6 +24,11 @@ use Illuminate\Support\Collection; use Steam; use Tests\TestCase; +/** + * Class AccountControllerTest + * + * @package Tests\Feature\Controllers\Chart + */ class AccountControllerTest extends TestCase { /** diff --git a/tests/Feature/Controllers/Chart/BillControllerTest.php b/tests/Feature/Controllers/Chart/BillControllerTest.php index 59c8e8efd6..b0251dc790 100644 --- a/tests/Feature/Controllers/Chart/BillControllerTest.php +++ b/tests/Feature/Controllers/Chart/BillControllerTest.php @@ -18,6 +18,11 @@ use FireflyIII\Repositories\Bill\BillRepositoryInterface; use Illuminate\Support\Collection; use Tests\TestCase; +/** + * Class BillControllerTest + * + * @package Tests\Feature\Controllers\Chart + */ class BillControllerTest extends TestCase { /** diff --git a/tests/Feature/Controllers/Chart/BudgetControllerTest.php b/tests/Feature/Controllers/Chart/BudgetControllerTest.php index 079d90820c..1f70434c54 100644 --- a/tests/Feature/Controllers/Chart/BudgetControllerTest.php +++ b/tests/Feature/Controllers/Chart/BudgetControllerTest.php @@ -22,6 +22,11 @@ use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use Illuminate\Support\Collection; use Tests\TestCase; +/** + * Class BudgetControllerTest + * + * @package Tests\Feature\Controllers\Chart + */ class BudgetControllerTest extends TestCase { diff --git a/tests/Feature/Controllers/Chart/CategoryControllerTest.php b/tests/Feature/Controllers/Chart/CategoryControllerTest.php index 3b5a88f52a..b2e06f7e5c 100644 --- a/tests/Feature/Controllers/Chart/CategoryControllerTest.php +++ b/tests/Feature/Controllers/Chart/CategoryControllerTest.php @@ -13,11 +13,20 @@ namespace Tests\Feature\Controllers\Chart; use Carbon\Carbon; +use FireflyIII\Generator\Chart\Basic\GeneratorInterface; +use FireflyIII\Models\Account; +use FireflyIII\Models\AccountType; +use FireflyIII\Models\Category; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use Illuminate\Support\Collection; use Tests\TestCase; +/** + * Class CategoryControllerTest + * + * @package Tests\Feature\Controllers\Chart + */ class CategoryControllerTest extends TestCase { @@ -30,11 +39,15 @@ class CategoryControllerTest extends TestCase */ public function testAll(string $range) { - $catRepository = $this->mock(CategoryRepositoryInterface::class); + $repository = $this->mock(CategoryRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $generator = $this->mock(GeneratorInterface::class); - $catRepository->shouldReceive('spentInPeriod')->andReturn('0'); - $catRepository->shouldReceive('earnedInPeriod')->andReturn('0'); - $catRepository->shouldReceive('firstUseDate')->andReturn(new Carbon); + $repository->shouldReceive('spentInPeriod')->andReturn('0'); + $repository->shouldReceive('earnedInPeriod')->andReturn('0'); + $repository->shouldReceive('firstUseDate')->andReturn(new Carbon)->once(); + $accountRepos->shouldReceive('getAccountsByType')->withArgs([[AccountType::DEFAULT, AccountType::ASSET]])->andReturn(new Collection)->once(); + $generator->shouldReceive('multiSet')->once()->andReturn([]); $this->be($this->user()); @@ -52,15 +65,17 @@ class CategoryControllerTest extends TestCase */ public function testCurrentPeriod(string $range) { - // this is actually for makePeriodChart - $accountRepository = $this->mock(AccountRepositoryInterface::class); - $categoryRepository = $this->mock(CategoryRepositoryInterface::class); - $account = $this->user()->accounts()->where('account_type_id', 5)->first(); - $accountRepository->shouldReceive('getAccountsByType')->andReturn(new Collection([$account])); - $categoryRepository->shouldReceive('spentInPeriod')->andReturn('0'); - $categoryRepository->shouldReceive('earnedInPeriod')->andReturn('0'); + $repository = $this->mock(CategoryRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $generator = $this->mock(GeneratorInterface::class); + $account = factory(Account::class)->make(); + $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection([$account])); + $repository->shouldReceive('spentInPeriod')->andReturn('0'); + $repository->shouldReceive('earnedInPeriod')->andReturn('0'); + $generator->shouldReceive('multiSet')->andReturn([])->once(); + $this->be($this->user()); $this->changeDateRange($this->user(), $range); $response = $this->get(route('chart.category.current', [1])); @@ -75,17 +90,17 @@ class CategoryControllerTest extends TestCase */ public function testFrontpage(string $range) { - $accountRepository = $this->mock(AccountRepositoryInterface::class); - $categoryRepository = $this->mock(CategoryRepositoryInterface::class); - $category = $this->user()->categories()->first(); - $account = $this->user()->accounts()->where('account_type_id', 5)->first(); - // get one category - $categoryRepository->shouldReceive('getCategories')->andReturn(new Collection([$category])); - // get one account - $accountRepository->shouldReceive('getAccountsByType')->andReturn(new Collection([$account])); - // always return zero - $categoryRepository->shouldReceive('spentInPeriod')->andReturn('0'); - $categoryRepository->shouldReceive('spentInPeriodWithoutCategory')->andReturn('0'); + $repository = $this->mock(CategoryRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $generator = $this->mock(GeneratorInterface::class); + $category = factory(Category::class)->make(); + $account = factory(Account::class)->make(); + + $repository->shouldReceive('getCategories')->andReturn(new Collection([$category])); + $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection([$account])); + $repository->shouldReceive('spentInPeriod')->andReturn('0'); + $repository->shouldReceive('spentInPeriodWithoutCategory')->andReturn('0'); + $generator->shouldReceive('singleSet')->andReturn([]); $this->be($this->user()); $this->changeDateRange($this->user(), $range); @@ -98,6 +113,14 @@ class CategoryControllerTest extends TestCase */ public function testReportPeriod() { + $repository = $this->mock(CategoryRepositoryInterface::class); + $generator = $this->mock(GeneratorInterface::class); + + $repository->shouldReceive('periodExpenses')->andReturn([])->once(); + $repository->shouldReceive('periodIncome')->andReturn([])->once(); + $generator->shouldReceive('multiSet')->andReturn([])->once(); + + $this->be($this->user()); $response = $this->get(route('chart.category.period', [1, '1', '20120101', '20120131'])); $response->assertStatus(200); @@ -108,6 +131,13 @@ class CategoryControllerTest extends TestCase */ public function testReportPeriodNoCategory() { + $repository = $this->mock(CategoryRepositoryInterface::class); + $generator = $this->mock(GeneratorInterface::class); + + $repository->shouldReceive('periodExpensesNoCategory')->andReturn([])->once(); + $repository->shouldReceive('periodIncomeNoCategory')->andReturn([])->once(); + $generator->shouldReceive('multiSet')->andReturn([])->once(); + $this->be($this->user()); $response = $this->get(route('chart.category.period.no-category', ['1', '20120101', '20120131'])); $response->assertStatus(200); @@ -122,12 +152,15 @@ class CategoryControllerTest extends TestCase */ public function testSpecificPeriod(string $range) { - $accountRepository = $this->mock(AccountRepositoryInterface::class); - $categoryRepository = $this->mock(CategoryRepositoryInterface::class); - $account = $this->user()->accounts()->where('account_type_id', 5)->first(); - $accountRepository->shouldReceive('getAccountsByType')->andReturn(new Collection([$account])); - $categoryRepository->shouldReceive('spentInPeriod')->andReturn('0'); - $categoryRepository->shouldReceive('earnedInPeriod')->andReturn('0'); + $repository = $this->mock(CategoryRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $generator = $this->mock(GeneratorInterface::class); + $account = factory(Account::class)->make(); + + $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection([$account])); + $repository->shouldReceive('spentInPeriod')->andReturn('0'); + $repository->shouldReceive('earnedInPeriod')->andReturn('0'); + $generator->shouldReceive('multiSet')->andReturn([])->once(); $this->be($this->user()); $this->changeDateRange($this->user(), $range); diff --git a/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php b/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php index 8626bfa981..cae2f3b8cb 100644 --- a/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php +++ b/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php @@ -12,8 +12,18 @@ declare(strict_types = 1); namespace Tests\Feature\Controllers\Chart; +use FireflyIII\Generator\Chart\Basic\GeneratorInterface; +use FireflyIII\Helpers\Chart\MetaPieChartInterface; +use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Models\TransactionType; +use Illuminate\Support\Collection; use Tests\TestCase; +/** + * Class CategoryReportControllerTest + * + * @package Tests\Feature\Controllers\Chart + */ class CategoryReportControllerTest extends TestCase { @@ -23,6 +33,17 @@ class CategoryReportControllerTest extends TestCase */ public function testAccountExpense() { + $generator = $this->mock(GeneratorInterface::class); + $pieChart = $this->mock(MetaPieChartInterface::class); + + $pieChart->shouldReceive('setAccounts')->once()->andReturnSelf(); + $pieChart->shouldReceive('setCategories')->once()->andReturnSelf(); + $pieChart->shouldReceive('setStart')->once()->andReturnSelf(); + $pieChart->shouldReceive('setEnd')->once()->andReturnSelf(); + $pieChart->shouldReceive('setCollectOtherObjects')->once()->andReturnSelf()->withArgs([false]); + $pieChart->shouldReceive('generate')->withArgs(['expense', 'account'])->andReturn([])->once(); + $generator->shouldReceive('pieChart')->andReturn([])->once(); + $this->be($this->user()); $response = $this->get(route('chart.category.account-expense', ['1', '1', '20120101', '20120131', 0])); $response->assertStatus(200); @@ -33,6 +54,17 @@ class CategoryReportControllerTest extends TestCase */ public function testAccountIncome() { + $generator = $this->mock(GeneratorInterface::class); + $pieChart = $this->mock(MetaPieChartInterface::class); + + $pieChart->shouldReceive('setAccounts')->once()->andReturnSelf(); + $pieChart->shouldReceive('setCategories')->once()->andReturnSelf(); + $pieChart->shouldReceive('setStart')->once()->andReturnSelf(); + $pieChart->shouldReceive('setEnd')->once()->andReturnSelf(); + $pieChart->shouldReceive('setCollectOtherObjects')->once()->andReturnSelf()->withArgs([false]); + $pieChart->shouldReceive('generate')->withArgs(['income', 'account'])->andReturn([])->once(); + $generator->shouldReceive('pieChart')->andReturn([])->once(); + $this->be($this->user()); $response = $this->get(route('chart.category.account-income', ['1', '1', '20120101', '20120131', 0])); $response->assertStatus(200); @@ -43,6 +75,17 @@ class CategoryReportControllerTest extends TestCase */ public function testCategoryExpense() { + $generator = $this->mock(GeneratorInterface::class); + $pieChart = $this->mock(MetaPieChartInterface::class); + + $pieChart->shouldReceive('setAccounts')->once()->andReturnSelf(); + $pieChart->shouldReceive('setCategories')->once()->andReturnSelf(); + $pieChart->shouldReceive('setStart')->once()->andReturnSelf(); + $pieChart->shouldReceive('setEnd')->once()->andReturnSelf(); + $pieChart->shouldReceive('setCollectOtherObjects')->once()->andReturnSelf()->withArgs([false]); + $pieChart->shouldReceive('generate')->withArgs(['expense', 'category'])->andReturn([])->once(); + $generator->shouldReceive('pieChart')->andReturn([])->once(); + $this->be($this->user()); $response = $this->get(route('chart.category.category-expense', ['1', '1', '20120101', '20120131', 0])); $response->assertStatus(200); @@ -53,6 +96,17 @@ class CategoryReportControllerTest extends TestCase */ public function testCategoryIncome() { + $generator = $this->mock(GeneratorInterface::class); + $pieChart = $this->mock(MetaPieChartInterface::class); + + $pieChart->shouldReceive('setAccounts')->once()->andReturnSelf(); + $pieChart->shouldReceive('setCategories')->once()->andReturnSelf(); + $pieChart->shouldReceive('setStart')->once()->andReturnSelf(); + $pieChart->shouldReceive('setEnd')->once()->andReturnSelf(); + $pieChart->shouldReceive('setCollectOtherObjects')->once()->andReturnSelf()->withArgs([false]); + $pieChart->shouldReceive('generate')->withArgs(['income', 'category'])->andReturn([])->once(); + $generator->shouldReceive('pieChart')->andReturn([])->once(); + $this->be($this->user()); $response = $this->get(route('chart.category.category-income', ['1', '1', '20120101', '20120131', 0])); $response->assertStatus(200); @@ -60,9 +114,25 @@ class CategoryReportControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Chart\CategoryReportController::mainChart + * @covers \FireflyIII\Http\Controllers\Chart\CategoryReportController::groupByCategory + * @covers \FireflyIII\Http\Controllers\Chart\CategoryReportController::getExpenses + * @covers \FireflyIII\Http\Controllers\Chart\CategoryReportController::getIncome */ public function testMainChart() { + $generator = $this->mock(GeneratorInterface::class); + $collector = $this->mock(JournalCollectorInterface::class); + + $collector->shouldReceive('setAccounts')->andReturnSelf(); + $collector->shouldReceive('setRange')->andReturnSelf(); + $collector->shouldReceive('setTypes')->withArgs([[TransactionType::WITHDRAWAL, TransactionType::TRANSFER]])->andReturnSelf(); + $collector->shouldReceive('setTypes')->withArgs([[TransactionType::DEPOSIT, TransactionType::TRANSFER]])->andReturnSelf(); + $collector->shouldReceive('disableFilter')->andReturnSelf(); + $collector->shouldReceive('setCategories')->andReturnSelf(); + $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); + $collector->shouldReceive('getJournals')->andReturn(new Collection); + $generator->shouldReceive('multiSet')->andReturn([])->once(); + $this->be($this->user()); $response = $this->get(route('chart.category.main', ['1', '1', '20120101', '20120131'])); $response->assertStatus(200); diff --git a/tests/Feature/Controllers/Chart/PiggyBankControllerTest.php b/tests/Feature/Controllers/Chart/PiggyBankControllerTest.php index 68a2d0f887..39b5870d68 100644 --- a/tests/Feature/Controllers/Chart/PiggyBankControllerTest.php +++ b/tests/Feature/Controllers/Chart/PiggyBankControllerTest.php @@ -12,8 +12,17 @@ declare(strict_types = 1); namespace Tests\Feature\Controllers\Chart; +use FireflyIII\Generator\Chart\Basic\GeneratorInterface; +use FireflyIII\Models\PiggyBankEvent; +use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; +use Illuminate\Support\Collection; use Tests\TestCase; +/** + * Class PiggyBankControllerTest + * + * @package Tests\Feature\Controllers\Chart + */ class PiggyBankControllerTest extends TestCase { /** @@ -22,6 +31,13 @@ class PiggyBankControllerTest extends TestCase */ public function testHistory() { + $generator = $this->mock(GeneratorInterface::class); + $repository = $this->mock(PiggyBankRepositoryInterface::class); + $event = factory(PiggyBankEvent::class)->make(); + + $repository->shouldReceive('getEvents')->andReturn(new Collection([$event])); + $generator->shouldReceive('singleSet')->once()->andReturn([]); + $this->be($this->user()); $response = $this->get(route('chart.piggy-bank.history', [1])); $response->assertStatus(200); diff --git a/tests/Feature/Controllers/Chart/ReportControllerTest.php b/tests/Feature/Controllers/Chart/ReportControllerTest.php index d42aa62364..795abc80ff 100644 --- a/tests/Feature/Controllers/Chart/ReportControllerTest.php +++ b/tests/Feature/Controllers/Chart/ReportControllerTest.php @@ -12,17 +12,31 @@ declare(strict_types = 1); namespace Tests\Feature\Controllers\Chart; +use FireflyIII\Generator\Chart\Basic\GeneratorInterface; +use FireflyIII\Repositories\Account\AccountTaskerInterface; +use Steam; use Tests\TestCase; +/** + * Class ReportControllerTest + * + * @package Tests\Feature\Controllers\Chart + */ class ReportControllerTest extends TestCase { /** * @covers \FireflyIII\Http\Controllers\Chart\ReportController::netWorth + * @covers \FireflyIII\Http\Controllers\Chart\ReportController::arraySum * @covers \FireflyIII\Http\Controllers\Chart\ReportController::__construct */ public function testNetWorth() { + $generator = $this->mock(GeneratorInterface::class); + + Steam::shouldReceive('balancesById')->andReturn(['5', '10']); + $generator->shouldReceive('singleSet')->andReturn([]); + $this->be($this->user()); $response = $this->get(route('chart.report.net-worth', [1, '20120101', '20120131'])); $response->assertStatus(200); @@ -30,9 +44,17 @@ class ReportControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Chart\ReportController::operations + * @covers \FireflyIII\Http\Controllers\Chart\ReportController::getChartData */ public function testOperations() { + $generator = $this->mock(GeneratorInterface::class); + $tasker = $this->mock(AccountTaskerInterface::class); + + $tasker->shouldReceive('amountOutInPeriod')->andReturn('-1'); + $tasker->shouldReceive('amountInInPeriod')->andReturn('1'); + $generator->shouldReceive('multiSet')->andReturn([]); + $this->be($this->user()); $response = $this->get(route('chart.report.operations', [1, '20120101', '20120131'])); $response->assertStatus(200); @@ -40,9 +62,17 @@ class ReportControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Chart\ReportController::sum + * @covers \FireflyIII\Http\Controllers\Chart\ReportController::getChartData */ public function testSum() { + $generator = $this->mock(GeneratorInterface::class); + $tasker = $this->mock(AccountTaskerInterface::class); + + $tasker->shouldReceive('amountOutInPeriod')->andReturn('-1'); + $tasker->shouldReceive('amountInInPeriod')->andReturn('1'); + $generator->shouldReceive('multiSet')->andReturn([]); + $this->be($this->user()); $response = $this->get(route('chart.report.sum', [1, '20120101', '20120131'])); $response->assertStatus(200); From aedc3fdff9b8a638faf7dd94667785674a9bf759 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 12 Mar 2017 20:43:37 +0100 Subject: [PATCH 069/151] Fix #620 --- app/Handlers/Events/StoredJournalEventHandler.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/Handlers/Events/StoredJournalEventHandler.php b/app/Handlers/Events/StoredJournalEventHandler.php index 2ea6f97659..ae67587d67 100644 --- a/app/Handlers/Events/StoredJournalEventHandler.php +++ b/app/Handlers/Events/StoredJournalEventHandler.php @@ -20,6 +20,7 @@ use FireflyIII\Models\PiggyBankRepetition; use FireflyIII\Models\Rule; use FireflyIII\Models\RuleGroup; use FireflyIII\Models\TransactionJournal; +use FireflyIII\Models\TransactionType; use FireflyIII\Rules\Processor; use FireflyIII\Support\Events\BillScanner; use Log; @@ -45,6 +46,16 @@ class StoredJournalEventHandler $piggyBankId = $event->piggyBankId; Log::debug(sprintf('Trying to connect journal %d to piggy bank %d.', $journal->id, $piggyBankId)); + /* + * Will only continue when journal is a transfer. + */ + Log::debug(sprintf('Journal transaction type is %s', $journal->transactionType->type)); + if ($journal->transactionType->type !== TransactionType::TRANSFER) { + Log::info(sprintf('Will not connect %s #%d to a piggy bank.', $journal->transactionType->type, $journal->id)); + + return true; + } + /* * Verify existence of piggy bank: */ From e53d294c1c20e2d75ee55d85ea58153f263589eb Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 12 Mar 2017 21:24:34 +0100 Subject: [PATCH 070/151] Expand tests. --- .../Controllers/Popup/ReportController.php | 1 - .../Controllers/AccountControllerTest.php | 4 + .../Controllers/AttachmentControllerTest.php | 1 + .../Chart/TagReportControllerTest.php | 181 ++++++++++++++++++ .../Controllers/JavascriptControllerTest.php | 63 ++++++ .../Popup/ReportControllerTest.php | 70 +++++++ .../Report/AccountControllerTest.php | 17 ++ .../Report/BalanceControllerTest.php | 10 + .../Report/BudgetControllerTest.php | 20 ++ .../Report/CategoryControllerTest.php | 24 +++ .../Report/OperationsControllerTest.php | 18 ++ .../Controllers/ReportControllerTest.php | 40 ++++ .../Transaction/MassControllerTest.php | 5 - 13 files changed, 448 insertions(+), 6 deletions(-) create mode 100644 tests/Feature/Controllers/Chart/TagReportControllerTest.php create mode 100644 tests/Feature/Controllers/JavascriptControllerTest.php diff --git a/app/Http/Controllers/Popup/ReportController.php b/app/Http/Controllers/Popup/ReportController.php index b4d648a873..20917d1c9f 100644 --- a/app/Http/Controllers/Popup/ReportController.php +++ b/app/Http/Controllers/Popup/ReportController.php @@ -20,7 +20,6 @@ use FireflyIII\Helpers\Collection\BalanceLine; use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Transaction; -use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; diff --git a/tests/Feature/Controllers/AccountControllerTest.php b/tests/Feature/Controllers/AccountControllerTest.php index aeec1e506b..902c148665 100644 --- a/tests/Feature/Controllers/AccountControllerTest.php +++ b/tests/Feature/Controllers/AccountControllerTest.php @@ -217,6 +217,7 @@ class AccountControllerTest extends TestCase */ public function testShowBrokenInitial() { + // mock $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); $date = new Carbon; @@ -301,6 +302,7 @@ class AccountControllerTest extends TestCase */ public function testShowInitial() { + // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); $date = new Carbon; @@ -317,6 +319,7 @@ class AccountControllerTest extends TestCase */ public function testStore() { + // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); $repository = $this->mock(AccountRepositoryInterface::class); $repository->shouldReceive('find')->andReturn(new Account)->once(); @@ -340,6 +343,7 @@ class AccountControllerTest extends TestCase */ public function testUpdate() { + // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); $repository = $this->mock(AccountRepositoryInterface::class); $repository->shouldReceive('find')->andReturn(new Account)->once(); diff --git a/tests/Feature/Controllers/AttachmentControllerTest.php b/tests/Feature/Controllers/AttachmentControllerTest.php index 42fe2a9a58..7b9daac63f 100644 --- a/tests/Feature/Controllers/AttachmentControllerTest.php +++ b/tests/Feature/Controllers/AttachmentControllerTest.php @@ -24,6 +24,7 @@ class AttachmentControllerTest extends TestCase */ public function testDelete() { + // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); $this->be($this->user()); diff --git a/tests/Feature/Controllers/Chart/TagReportControllerTest.php b/tests/Feature/Controllers/Chart/TagReportControllerTest.php new file mode 100644 index 0000000000..0b2ec47f8d --- /dev/null +++ b/tests/Feature/Controllers/Chart/TagReportControllerTest.php @@ -0,0 +1,181 @@ +mock(GeneratorInterface::class); + $pieChart = $this->mock(MetaPieChartInterface::class); + + $pieChart->shouldReceive('setAccounts')->once()->andReturnSelf(); + $pieChart->shouldReceive('setTags')->once()->andReturnSelf(); + $pieChart->shouldReceive('setStart')->once()->andReturnSelf(); + $pieChart->shouldReceive('setEnd')->once()->andReturnSelf(); + $pieChart->shouldReceive('setCollectOtherObjects')->once()->andReturnSelf()->withArgs([false]); + $pieChart->shouldReceive('generate')->withArgs(['expense', 'account'])->andReturn([])->once(); + $generator->shouldReceive('pieChart')->andReturn([])->once(); + + $this->be($this->user()); + $response = $this->get(route('chart.tag.account-expense', ['1', 'housing', '20120101', '20120131', 0])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Chart\TagReportController::accountIncome + */ + public function testAccountIncome() + { + $generator = $this->mock(GeneratorInterface::class); + $pieChart = $this->mock(MetaPieChartInterface::class); + + $pieChart->shouldReceive('setAccounts')->once()->andReturnSelf(); + $pieChart->shouldReceive('setTags')->once()->andReturnSelf(); + $pieChart->shouldReceive('setStart')->once()->andReturnSelf(); + $pieChart->shouldReceive('setEnd')->once()->andReturnSelf(); + $pieChart->shouldReceive('setCollectOtherObjects')->once()->andReturnSelf()->withArgs([false]); + $pieChart->shouldReceive('generate')->withArgs(['income', 'account'])->andReturn([])->once(); + $generator->shouldReceive('pieChart')->andReturn([])->once(); + + $this->be($this->user()); + $response = $this->get(route('chart.tag.account-income', ['1', 'housing', '20120101', '20120131', 0])); + $response->assertStatus(200); + + } + + /** + * @covers \FireflyIII\Http\Controllers\Chart\TagReportController::budgetExpense() + */ + public function testBudgetExpense() + { + $generator = $this->mock(GeneratorInterface::class); + $pieChart = $this->mock(MetaPieChartInterface::class); + + $pieChart->shouldReceive('setAccounts')->once()->andReturnSelf(); + $pieChart->shouldReceive('setTags')->once()->andReturnSelf(); + $pieChart->shouldReceive('setStart')->once()->andReturnSelf(); + $pieChart->shouldReceive('setEnd')->once()->andReturnSelf(); + $pieChart->shouldReceive('setCollectOtherObjects')->once()->andReturnSelf()->withArgs([false]); + $pieChart->shouldReceive('generate')->withArgs(['expense', 'budget'])->andReturn([])->once(); + $generator->shouldReceive('pieChart')->andReturn([])->once(); + + $this->be($this->user()); + $response = $this->get(route('chart.tag.budget-expense', ['1', 'housing', '20120101', '20120131', 0])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Chart\TagReportController::categoryExpense() + */ + public function testCategoryExpense() + { + $generator = $this->mock(GeneratorInterface::class); + $pieChart = $this->mock(MetaPieChartInterface::class); + + $pieChart->shouldReceive('setAccounts')->once()->andReturnSelf(); + $pieChart->shouldReceive('setTags')->once()->andReturnSelf(); + $pieChart->shouldReceive('setStart')->once()->andReturnSelf(); + $pieChart->shouldReceive('setEnd')->once()->andReturnSelf(); + $pieChart->shouldReceive('setCollectOtherObjects')->once()->andReturnSelf()->withArgs([false]); + $pieChart->shouldReceive('generate')->withArgs(['expense', 'category'])->andReturn([])->once(); + $generator->shouldReceive('pieChart')->andReturn([])->once(); + + $this->be($this->user()); + $response = $this->get(route('chart.tag.category-expense', ['1', 'housing', '20120101', '20120131', 0])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Chart\TagReportController::mainChart() + */ + public function testMainChart() + { + $generator = $this->mock(GeneratorInterface::class); + $collector = $this->mock(JournalCollectorInterface::class); + + $collector->shouldReceive('setAccounts')->andReturnSelf(); + $collector->shouldReceive('setRange')->andReturnSelf(); + $collector->shouldReceive('setTypes')->withArgs([[TransactionType::WITHDRAWAL, TransactionType::TRANSFER]])->andReturnSelf(); + $collector->shouldReceive('setTypes')->withArgs([[TransactionType::DEPOSIT, TransactionType::TRANSFER]])->andReturnSelf(); + $collector->shouldReceive('disableFilter')->andReturnSelf(); + $collector->shouldReceive('setTags')->andReturnSelf(); + $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); + $collector->shouldReceive('getJournals')->andReturn(new Collection); + $generator->shouldReceive('multiSet')->andReturn([])->once(); + + $this->be($this->user()); + $response = $this->get(route('chart.tag.main', ['1', 'housing', '20120101', '20120131'])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Chart\TagReportController::tagExpense() + */ + public function testTagExpense() + { + $generator = $this->mock(GeneratorInterface::class); + $pieChart = $this->mock(MetaPieChartInterface::class); + + $pieChart->shouldReceive('setAccounts')->once()->andReturnSelf(); + $pieChart->shouldReceive('setTags')->once()->andReturnSelf(); + $pieChart->shouldReceive('setStart')->once()->andReturnSelf(); + $pieChart->shouldReceive('setEnd')->once()->andReturnSelf(); + $pieChart->shouldReceive('setCollectOtherObjects')->once()->andReturnSelf()->withArgs([false]); + $pieChart->shouldReceive('generate')->withArgs(['expense', 'tag'])->andReturn([])->once(); + $generator->shouldReceive('pieChart')->andReturn([])->once(); + + $this->be($this->user()); + $response = $this->get(route('chart.tag.tag-expense', ['1', 'housing', '20120101', '20120131', 0])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Chart\TagReportController::tagIncome() + */ + public function testTagIncome() + { + $generator = $this->mock(GeneratorInterface::class); + $pieChart = $this->mock(MetaPieChartInterface::class); + + $pieChart->shouldReceive('setAccounts')->once()->andReturnSelf(); + $pieChart->shouldReceive('setTags')->once()->andReturnSelf(); + $pieChart->shouldReceive('setStart')->once()->andReturnSelf(); + $pieChart->shouldReceive('setEnd')->once()->andReturnSelf(); + $pieChart->shouldReceive('setCollectOtherObjects')->once()->andReturnSelf()->withArgs([false]); + $pieChart->shouldReceive('generate')->withArgs(['income', 'tag'])->andReturn([])->once(); + $generator->shouldReceive('pieChart')->andReturn([])->once(); + + $this->be($this->user()); + $response = $this->get(route('chart.tag.tag-income', ['1', 'housing', '20120101', '20120131', 0])); + $response->assertStatus(200); + } + + +} diff --git a/tests/Feature/Controllers/JavascriptControllerTest.php b/tests/Feature/Controllers/JavascriptControllerTest.php new file mode 100644 index 0000000000..bbae285845 --- /dev/null +++ b/tests/Feature/Controllers/JavascriptControllerTest.php @@ -0,0 +1,63 @@ +mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $account = factory(Account::class)->make(); + + $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection([$account])) + ->withArgs([[AccountType::DEFAULT, AccountType::ASSET]])->once(); + $currencyRepos->shouldReceive('findByCode')->withArgs(['EUR'])->andReturn(new TransactionCurrency); + + $this->be($this->user()); + $response = $this->get(route('javascript.accounts')); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\JavascriptController::variables + * @covers \FireflyIII\Http\Controllers\JavascriptController::getDateRangePicker + * + * @param string $range + * + * @dataProvider dateRangeProvider + */ + public function testVariables(string $range) + { + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('javascript.variables')); + $response->assertStatus(200); + } + +} diff --git a/tests/Feature/Controllers/Popup/ReportControllerTest.php b/tests/Feature/Controllers/Popup/ReportControllerTest.php index 473c25230e..7b024ff8ff 100644 --- a/tests/Feature/Controllers/Popup/ReportControllerTest.php +++ b/tests/Feature/Controllers/Popup/ReportControllerTest.php @@ -13,8 +13,18 @@ namespace Tests\Feature\Controllers\Popup; use Carbon\Carbon; +use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Models\Account; +use FireflyIII\Models\Budget; +use FireflyIII\Models\Category; +use FireflyIII\Models\TransactionType; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; +use FireflyIII\Repositories\Category\CategoryRepositoryInterface; +use Illuminate\Support\Collection; use Tests\TestCase; + /** * Class ReportControllerTest * @@ -25,9 +35,24 @@ class ReportControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Popup\ReportController::general + * @covers \FireflyIII\Http\Controllers\Popup\ReportController::parseAttributes + * @covers \FireflyIII\Http\Controllers\Popup\ReportController::balanceAmount */ public function testBalanceAmount() { + $collector = $this->mock(JournalCollectorInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $budgetRepos = $this->mock(BudgetRepositoryInterface::class); + $budget = factory(Budget::class)->make(); + $account = factory(Account::class)->make(); + + $budgetRepos->shouldReceive('find')->andReturn($budget)->once()->withArgs([1]); + $accountRepos->shouldReceive('find')->andReturn($account)->once()->withArgs([1]); + $collector->shouldReceive('setAccounts')->andReturnSelf()->once(); + $collector->shouldReceive('setTypes')->withArgs([[TransactionType::WITHDRAWAL]])->andReturnSelf(); + $collector->shouldReceive('setRange')->once()->andReturnSelf(); + $collector->shouldReceive('withoutBudget')->once()->andReturnSelf(); + $collector->shouldReceive('getJournals')->once()->andReturn(new Collection); $this->be($this->user()); $arguments = [ @@ -49,9 +74,20 @@ class ReportControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Popup\ReportController::general + * @covers \FireflyIII\Http\Controllers\Popup\ReportController::parseAttributes + * @covers \FireflyIII\Http\Controllers\Popup\ReportController::budgetSpentAmount() */ public function testBudgetSpentAmount() { + $collector = $this->mock(JournalCollectorInterface::class); + $budgetRepos = $this->mock(BudgetRepositoryInterface::class); + $budget = factory(Budget::class)->make(); + + $budgetRepos->shouldReceive('find')->andReturn($budget)->once()->withArgs([1]); + $collector->shouldReceive('setAccounts')->andReturnSelf()->once(); + $collector->shouldReceive('setRange')->once()->andReturnSelf(); + $collector->shouldReceive('setBudget')->once()->andReturnSelf(); + $collector->shouldReceive('getJournals')->once()->andReturn(new Collection); $this->be($this->user()); $arguments = [ @@ -72,9 +108,21 @@ class ReportControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Popup\ReportController::general + * @covers \FireflyIII\Http\Controllers\Popup\ReportController::parseAttributes + * @covers \FireflyIII\Http\Controllers\Popup\ReportController::categoryEntry() */ public function testCategoryEntry() { + $collector = $this->mock(JournalCollectorInterface::class); + $categoryRepos = $this->mock(CategoryRepositoryInterface::class); + $category = factory(Category::class)->make(); + + $categoryRepos->shouldReceive('find')->andReturn($category)->once()->withArgs([1]); + $collector->shouldReceive('setAccounts')->andReturnSelf()->once(); + $collector->shouldReceive('setTypes')->andReturnSelf()->once()->withArgs([[TransactionType::WITHDRAWAL, TransactionType::TRANSFER]]); + $collector->shouldReceive('setRange')->once()->andReturnSelf(); + $collector->shouldReceive('setCategory')->once()->andReturnSelf(); + $collector->shouldReceive('getJournals')->once()->andReturn(new Collection); $this->be($this->user()); $arguments = [ @@ -95,9 +143,20 @@ class ReportControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Popup\ReportController::general + * @covers \FireflyIII\Http\Controllers\Popup\ReportController::parseAttributes + * @covers \FireflyIII\Http\Controllers\Popup\ReportController::expenseEntry() */ public function testExpenseEntry() { + $collector = $this->mock(JournalCollectorInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $account = factory(Account::class)->make(); + + $accountRepos->shouldReceive('find')->withArgs([1])->andReturn($account)->once(); + $collector->shouldReceive('setAccounts')->andReturnSelf()->once(); + $collector->shouldReceive('setTypes')->andReturnSelf()->once()->withArgs([[TransactionType::WITHDRAWAL, TransactionType::TRANSFER]]); + $collector->shouldReceive('setRange')->once()->andReturnSelf(); + $collector->shouldReceive('getJournals')->once()->andReturn(new Collection); $this->be($this->user()); $arguments = [ @@ -118,9 +177,20 @@ class ReportControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Popup\ReportController::general + * @covers \FireflyIII\Http\Controllers\Popup\ReportController::parseAttributes + * @covers \FireflyIII\Http\Controllers\Popup\ReportController::incomeEntry() */ public function testIncomeEntry() { + $collector = $this->mock(JournalCollectorInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $account = factory(Account::class)->make(); + + $accountRepos->shouldReceive('find')->withArgs([1])->andReturn($account)->once(); + $collector->shouldReceive('setAccounts')->andReturnSelf()->once(); + $collector->shouldReceive('setTypes')->andReturnSelf()->once()->withArgs([[TransactionType::DEPOSIT, TransactionType::TRANSFER]]); + $collector->shouldReceive('setRange')->once()->andReturnSelf(); + $collector->shouldReceive('getJournals')->once()->andReturn(new Collection); $this->be($this->user()); $arguments = [ diff --git a/tests/Feature/Controllers/Report/AccountControllerTest.php b/tests/Feature/Controllers/Report/AccountControllerTest.php index 8c3262ef62..1e32a4bf9d 100644 --- a/tests/Feature/Controllers/Report/AccountControllerTest.php +++ b/tests/Feature/Controllers/Report/AccountControllerTest.php @@ -12,8 +12,14 @@ declare(strict_types = 1); namespace Tests\Feature\Controllers\Report; +use FireflyIII\Repositories\Account\AccountTaskerInterface; use Tests\TestCase; +/** + * Class AccountControllerTest + * + * @package Tests\Feature\Controllers\Report + */ class AccountControllerTest extends TestCase { /** @@ -21,6 +27,17 @@ class AccountControllerTest extends TestCase */ public function testGeneral() { + $return = [ + 'accounts' => [], + 'start' => '0', + 'end' => '0', + 'difference' => '0', + ]; + + $tasker = $this->mock(AccountTaskerInterface::class); + $tasker->shouldReceive('getAccountReport')->andReturn($return); + + $this->be($this->user()); $response = $this->get(route('report-data.account.general', ['1', '20120101', '20120131'])); $response->assertStatus(200); diff --git a/tests/Feature/Controllers/Report/BalanceControllerTest.php b/tests/Feature/Controllers/Report/BalanceControllerTest.php index 3013f6c969..f1d5a29b52 100644 --- a/tests/Feature/Controllers/Report/BalanceControllerTest.php +++ b/tests/Feature/Controllers/Report/BalanceControllerTest.php @@ -12,8 +12,15 @@ declare(strict_types = 1); namespace Tests\Feature\Controllers\Report; +use FireflyIII\Helpers\Collection\Balance; +use FireflyIII\Helpers\Report\BalanceReportHelperInterface; use Tests\TestCase; +/** + * Class BalanceControllerTest + * + * @package Tests\Feature\Controllers\Report + */ class BalanceControllerTest extends TestCase { /** @@ -21,6 +28,9 @@ class BalanceControllerTest extends TestCase */ public function testGeneral() { + $balance = $this->mock(BalanceReportHelperInterface::class); + $balance->shouldReceive('getBalanceReport')->andReturn(new Balance); + $this->be($this->user()); $response = $this->get(route('report-data.balance.general', ['1', '20120101', '20120131'])); $response->assertStatus(200); diff --git a/tests/Feature/Controllers/Report/BudgetControllerTest.php b/tests/Feature/Controllers/Report/BudgetControllerTest.php index a68b0fd460..e67f603e98 100644 --- a/tests/Feature/Controllers/Report/BudgetControllerTest.php +++ b/tests/Feature/Controllers/Report/BudgetControllerTest.php @@ -12,8 +12,16 @@ declare(strict_types = 1); namespace Tests\Feature\Controllers\Report; +use FireflyIII\Helpers\Report\BudgetReportHelperInterface; +use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; +use Illuminate\Support\Collection; use Tests\TestCase; +/** + * Class BudgetControllerTest + * + * @package Tests\Feature\Controllers\Report + */ class BudgetControllerTest extends TestCase { /** @@ -21,6 +29,10 @@ class BudgetControllerTest extends TestCase */ public function testGeneral() { + $return = []; + $helper = $this->mock(BudgetReportHelperInterface::class); + $helper->shouldReceive('getBudgetReport')->andReturn($return); + $this->be($this->user()); $response = $this->get(route('report-data.budget.general', ['1', '20120101', '20120131'])); $response->assertStatus(200); @@ -28,9 +40,17 @@ class BudgetControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Report\BudgetController::period + * @covers \FireflyIII\Http\Controllers\Report\BudgetController::filterBudgetPeriodReport */ public function testPeriod() { + $first = [1 => ['entries' => ['1', '1']]]; + $second = ['entries' => ['1', '1']]; + $repository = $this->mock(BudgetRepositoryInterface::class); + $repository->shouldReceive('getBudgets')->andReturn(new Collection); + $repository->shouldReceive('getBudgetPeriodReport')->andReturn($first); + $repository->shouldReceive('getNoBudgetPeriodReport')->andReturn($second); + $this->be($this->user()); $response = $this->get(route('report-data.budget.period', ['1', '20120101', '20120131'])); $response->assertStatus(200); diff --git a/tests/Feature/Controllers/Report/CategoryControllerTest.php b/tests/Feature/Controllers/Report/CategoryControllerTest.php index e4b3e86a03..736c6f9f15 100644 --- a/tests/Feature/Controllers/Report/CategoryControllerTest.php +++ b/tests/Feature/Controllers/Report/CategoryControllerTest.php @@ -12,15 +12,26 @@ declare(strict_types = 1); namespace Tests\Feature\Controllers\Report; +use FireflyIII\Models\Category; +use FireflyIII\Repositories\Category\CategoryRepositoryInterface; +use Illuminate\Support\Collection; use Tests\TestCase; class CategoryControllerTest extends TestCase { /** * @covers \FireflyIII\Http\Controllers\Report\CategoryController::expenses + * @covers \FireflyIII\Http\Controllers\Report\CategoryController::filterReport */ public function testExpenses() { + $first = [1 => ['entries' => ['1', '1']]]; + $second = ['entries' => ['1', '1']]; + $repository = $this->mock(CategoryRepositoryInterface::class); + $repository->shouldReceive('getCategories')->andReturn(new Collection); + $repository->shouldReceive('periodExpenses')->andReturn($first); + $repository->shouldReceive('periodExpensesNoCategory')->andReturn($second); + $this->be($this->user()); $response = $this->get(route('report-data.category.expenses', ['1', '20120101', '20120131'])); $response->assertStatus(200); @@ -28,9 +39,17 @@ class CategoryControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Report\CategoryController::income + * @covers \FireflyIII\Http\Controllers\Report\CategoryController::filterReport */ public function testIncome() { + $first = [1 => ['entries' => ['1', '1']]]; + $second = ['entries' => ['1', '1']]; + $repository = $this->mock(CategoryRepositoryInterface::class); + $repository->shouldReceive('getCategories')->andReturn(new Collection); + $repository->shouldReceive('periodIncome')->andReturn($first); + $repository->shouldReceive('periodIncomeNoCategory')->andReturn($second); + $this->be($this->user()); $response = $this->get(route('report-data.category.income', ['1', '20120101', '20120131'])); $response->assertStatus(200); @@ -41,6 +60,11 @@ class CategoryControllerTest extends TestCase */ public function testOperations() { + $repository = $this->mock(CategoryRepositoryInterface::class); + $category = factory(Category::class)->make(); + $repository->shouldReceive('getCategories')->andReturn(new Collection([$category])); + $repository->shouldReceive('spentInPeriod')->andReturn('-1'); + $this->be($this->user()); $response = $this->get(route('report-data.category.operations', ['1', '20120101', '20120131'])); $response->assertStatus(200); diff --git a/tests/Feature/Controllers/Report/OperationsControllerTest.php b/tests/Feature/Controllers/Report/OperationsControllerTest.php index 65e8efd334..f675e477a1 100644 --- a/tests/Feature/Controllers/Report/OperationsControllerTest.php +++ b/tests/Feature/Controllers/Report/OperationsControllerTest.php @@ -17,6 +17,11 @@ use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionType; use Tests\TestCase; +/** + * Class OperationsControllerTest + * + * @package Tests\Feature\Controllers\Report + */ class OperationsControllerTest extends TestCase { /** @@ -28,6 +33,7 @@ class OperationsControllerTest extends TestCase { $transactions = factory(Transaction::class, 10)->make(); $collector = $this->mock(JournalCollectorInterface::class); + $collector->shouldReceive('setAccounts')->andReturnSelf(); $collector->shouldReceive('setRange')->andReturnSelf(); $collector->shouldReceive('setTypes')->withArgs([[TransactionType::WITHDRAWAL, TransactionType::TRANSFER]])->andReturnSelf(); @@ -49,6 +55,7 @@ class OperationsControllerTest extends TestCase { $transactions = factory(Transaction::class, 10)->make(); $collector = $this->mock(JournalCollectorInterface::class); + $collector->shouldReceive('setAccounts')->andReturnSelf(); $collector->shouldReceive('setRange')->andReturnSelf(); $collector->shouldReceive('setTypes')->withArgs([[TransactionType::DEPOSIT, TransactionType::TRANSFER]])->andReturnSelf(); @@ -66,6 +73,17 @@ class OperationsControllerTest extends TestCase */ public function testOperations() { + $collector = $this->mock(JournalCollectorInterface::class); + $transactions = factory(Transaction::class, 10)->make(); + + $collector->shouldReceive('setAccounts')->andReturnSelf(); + $collector->shouldReceive('setRange')->andReturnSelf(); + $collector->shouldReceive('setTypes')->withArgs([[TransactionType::DEPOSIT, TransactionType::TRANSFER]])->andReturnSelf()->once(); + $collector->shouldReceive('setTypes')->withArgs([[TransactionType::WITHDRAWAL, TransactionType::TRANSFER]])->andReturnSelf()->once(); + $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); + $collector->shouldReceive('enableInternalFilter')->andReturnSelf(); + $collector->shouldReceive('getJournals')->andReturn($transactions); + $this->be($this->user()); $response = $this->get(route('report-data.operations.operations', ['1', '20160101', '20160131'])); $response->assertStatus(200); diff --git a/tests/Feature/Controllers/ReportControllerTest.php b/tests/Feature/Controllers/ReportControllerTest.php index f7071fa1f4..28484e09d4 100644 --- a/tests/Feature/Controllers/ReportControllerTest.php +++ b/tests/Feature/Controllers/ReportControllerTest.php @@ -141,6 +141,46 @@ class ReportControllerTest extends TestCase $response->assertStatus(200); } + /** + * @covers \FireflyIII\Http\Controllers\ReportController::options + * @covers \FireflyIII\Http\Controllers\ReportController::budgetReportOptions + */ + public function testOptionsBudget() + { + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); + + $this->be($this->user()); + $response = $this->get(route('reports.options', ['budget'])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\ReportController::options + */ + public function testOptionsCategory() + { + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); + + $this->be($this->user()); + $response = $this->get(route('reports.options', ['default'])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\ReportController::options + */ + public function testOptionsTag() + { + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); + + $this->be($this->user()); + $response = $this->get(route('reports.options', ['default'])); + $response->assertStatus(200); + } + /** * @covers \FireflyIII\Http\Controllers\ReportController::postIndex */ diff --git a/tests/Feature/Controllers/Transaction/MassControllerTest.php b/tests/Feature/Controllers/Transaction/MassControllerTest.php index c662c2c6b5..6ff71c2347 100644 --- a/tests/Feature/Controllers/Transaction/MassControllerTest.php +++ b/tests/Feature/Controllers/Transaction/MassControllerTest.php @@ -19,7 +19,6 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Illuminate\Support\Collection; -use Log; use Tests\TestCase; /** @@ -97,7 +96,6 @@ class MassControllerTest extends TestCase */ public function testEditMultiple() { - Log::debug('Edit multiple.'); // mock stuff: $repository = $this->mock(AccountRepositoryInterface::class); $repository->shouldReceive('getAccountsByType')->once()->withArgs([[AccountType::DEFAULT, AccountType::ASSET]])->andReturn(new Collection); @@ -125,7 +123,6 @@ class MassControllerTest extends TestCase ->where('user_id', $this->user()->id)->first(['transaction_journals.id', DB::raw('count(transactions.`id`) as ct')]) ); $allIds = $collection->pluck('id')->toArray(); - Log::debug('Ids', $allIds); $this->be($this->user()); $response = $this->get(route('transactions.mass.edit', join(',', $allIds))); @@ -140,7 +137,6 @@ class MassControllerTest extends TestCase */ public function testEditMultipleNothingLeft() { - Log::debug('Edit multiple.'); // mock stuff: $repository = $this->mock(AccountRepositoryInterface::class); $repository->shouldReceive('getAccountsByType')->once()->withArgs([[AccountType::DEFAULT, AccountType::ASSET]])->andReturn(new Collection); @@ -156,7 +152,6 @@ class MassControllerTest extends TestCase ->where('user_id', $this->user()->id)->first(['transaction_journals.id', DB::raw('count(transactions.`id`) as ct')]) ); $allIds = $collection->pluck('id')->toArray(); - Log::debug('Ids', $allIds); $this->be($this->user()); $response = $this->get(route('transactions.mass.edit', join(',', $allIds))); From 79aa0afc974fd138fe4830d0bee75d219d980482 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 15 Mar 2017 20:09:36 +0100 Subject: [PATCH 071/151] Possible fix for #619 --- app/Support/Amount.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/Support/Amount.php b/app/Support/Amount.php index 1d2477b716..107e70b8e9 100644 --- a/app/Support/Amount.php +++ b/app/Support/Amount.php @@ -13,6 +13,7 @@ declare(strict_types = 1); namespace FireflyIII\Support; +use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionJournal; @@ -171,7 +172,7 @@ class Amount */ public function formatByCode(string $currencyCode, string $amount, bool $coloured = true): string { - $currency = TransactionCurrency::whereCode($currencyCode)->first(); + $currency = TransactionCurrency::where('code', $currencyCode)->first(); return $this->formatAnything($currency, $amount, $coloured); } @@ -224,7 +225,7 @@ class Amount } else { $currencyPreference = Prefs::get('currencyPreference', config('firefly.default_currency', 'EUR')); - $currency = TransactionCurrency::whereCode($currencyPreference->data)->first(); + $currency = TransactionCurrency::where('code', $currencyPreference->data)->first(); if ($currency) { $cache->store($currency->code); @@ -248,7 +249,7 @@ class Amount return $cache->get(); // @codeCoverageIgnore } else { $currencyPreference = Prefs::get('currencyPreference', config('firefly.default_currency', 'EUR')); - $currency = TransactionCurrency::whereCode($currencyPreference->data)->first(); + $currency = TransactionCurrency::where('code', $currencyPreference->data)->first(); $cache->store($currency->symbol); @@ -267,7 +268,12 @@ class Amount return $cache->get(); // @codeCoverageIgnore } $currencyPreference = Prefs::get('currencyPreference', config('firefly.default_currency', 'EUR')); - $currency = TransactionCurrency::whereCode($currencyPreference->data)->first(); + $currency = TransactionCurrency::where('code', $currencyPreference->data)->first(); + + if (is_null($currency)) { + throw new FireflyException(sprintf('No currency found with code "%s"', $currencyPreference->data)); + } + $cache->store($currency); return $currency; From d618ddc8c5a663712f8da412556eee759dfaae18 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 16 Mar 2017 17:52:13 +0100 Subject: [PATCH 072/151] Lot of debug info for #619 --- app/Support/Amount.php | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/app/Support/Amount.php b/app/Support/Amount.php index 107e70b8e9..4db387fc99 100644 --- a/app/Support/Amount.php +++ b/app/Support/Amount.php @@ -111,6 +111,8 @@ class Amount */ public function format(string $amount, bool $coloured = true): string { + Log::debug(sprintf('Now in format("%s", %s).', $amount, var_export($coloured, true))); + return $this->formatAnything($this->getDefaultCurrency(), $amount, $coloured); } @@ -126,12 +128,19 @@ class Amount */ public function formatAnything(TransactionCurrency $format, string $amount, bool $coloured = true): string { + Log::debug(sprintf('Now in formatAnything($format, "%s",%s)', $amount, var_export($coloured, true))); + Log::debug('Currency $format: ', $format->toArray()); $locale = explode(',', trans('config.locale')); $locale = array_map('trim', $locale); + Log::debug('Locale is ', $locale); setlocale(LC_MONETARY, $locale); $float = round($amount, 12); $info = localeconv(); - $formatted = number_format($float, $format->decimal_places, $info['mon_decimal_point'], $info['mon_thousands_sep']); + Log::debug('Localeconv is', $info); + Log::debug(sprintf('Now calling number_format(%f, %d, "%s", "%s")', $float, $format->decimal_places, $info['mon_decimal_point'], $info['mon_thousands_sep'])); + Log::debug('Decimal places raw: %s', var_export($format->decimal_places, true)); + + $formatted = number_format($float, intval($format->decimal_places), $info['mon_decimal_point'], $info['mon_thousands_sep']); // some complicated switches to format the amount correctly: $precedes = $amount < 0 ? $info['n_cs_precedes'] : $info['p_cs_precedes']; @@ -262,20 +271,29 @@ class Amount */ public function getDefaultCurrency(): TransactionCurrency { + Log::debug('Now in getDefaultCurrency()'); $cache = new CacheProperties; $cache->addProperty('getDefaultCurrency'); if ($cache->has()) { + Log::debug('Return cache value: ', $cache->get()->toArray()); + return $cache->get(); // @codeCoverageIgnore } + Log::debug('getDefaultCurrency() is not in cache.'); $currencyPreference = Prefs::get('currencyPreference', config('firefly.default_currency', 'EUR')); - $currency = TransactionCurrency::where('code', $currencyPreference->data)->first(); + Log::debug('currencyPreference is', $currencyPreference->toArray()); + $currency = TransactionCurrency::where('code', $currencyPreference->data)->first(); if (is_null($currency)) { + Log::debug('Currency is NULL!'); throw new FireflyException(sprintf('No currency found with code "%s"', $currencyPreference->data)); } + Log::debug('Currency is ', $currency->toArray()); $cache->store($currency); + Log::debug('Return $currency'); + return $currency; } From 2db8d2503882c7b6f9175e936791b891c194bb0b Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 16 Mar 2017 20:46:18 +0100 Subject: [PATCH 073/151] This should fix tests --- app/Http/Controllers/JsonController.php | 2 +- .../Currency/CurrencyRepository.php | 4 +- routes/web.php | 4 +- .../Controllers/JavascriptControllerTest.php | 2 + .../Controllers/JsonControllerTest.php | 75 +++++++++++++++++-- .../Controllers/PreferencesControllerTest.php | 1 + .../Controllers/ReportControllerTest.php | 26 ++++++- .../Controllers/RuleControllerTest.php | 56 ++++++-------- .../Controllers/RuleGroupControllerTest.php | 28 +++++-- 9 files changed, 147 insertions(+), 51 deletions(-) diff --git a/app/Http/Controllers/JsonController.php b/app/Http/Controllers/JsonController.php index 684470d7cc..c20552ae0a 100644 --- a/app/Http/Controllers/JsonController.php +++ b/app/Http/Controllers/JsonController.php @@ -287,7 +287,7 @@ class JsonController extends Controller { $pref = Preferences::get('tour', true); if (!$pref) { - throw new FireflyException('Cannot find preference for tour. Exit.'); + throw new FireflyException('Cannot find preference for tour. Exit.'); // @codeCoverageIgnore } $headers = ['main-content', 'sidebar-toggle', 'account-menu', 'budget-menu', 'report-menu', 'transaction-menu', 'option-menu', 'main-content-end']; $steps = []; diff --git a/app/Repositories/Currency/CurrencyRepository.php b/app/Repositories/Currency/CurrencyRepository.php index 9af830efae..e16efb4cea 100644 --- a/app/Repositories/Currency/CurrencyRepository.php +++ b/app/Repositories/Currency/CurrencyRepository.php @@ -113,7 +113,7 @@ class CurrencyRepository implements CurrencyRepositoryInterface */ public function findByCode(string $currencyCode): TransactionCurrency { - $currency = TransactionCurrency::whereCode($currencyCode)->first(); + $currency = TransactionCurrency::where('code', $currencyCode)->first(); if (is_null($currency)) { $currency = new TransactionCurrency; } @@ -170,7 +170,7 @@ class CurrencyRepository implements CurrencyRepositoryInterface */ public function getCurrencyByPreference(Preference $preference): TransactionCurrency { - $preferred = TransactionCurrency::whereCode($preference->data)->first(); + $preferred = TransactionCurrency::where('code', $preference->data)->first(); if (is_null($preferred)) { $preferred = TransactionCurrency::first(); } diff --git a/routes/web.php b/routes/web.php index 5e15748ca5..f8b9c47ab2 100755 --- a/routes/web.php +++ b/routes/web.php @@ -430,8 +430,8 @@ Route::group( Route::get('tour', ['uses' => 'JsonController@tour', 'as' => 'tour']); Route::get('box/in', ['uses' => 'JsonController@boxIn', 'as' => 'box.in']); Route::get('box/out', ['uses' => 'JsonController@boxOut', 'as' => 'box.out']); - Route::get('box/bills-unpaid', ['uses' => 'JsonController@boxBillsUnpaid', 'as' => 'box.paid']); - Route::get('box/bills-paid', ['uses' => 'JsonController@boxBillsPaid', 'as' => 'box.unpaid']); + Route::get('box/bills-unpaid', ['uses' => 'JsonController@boxBillsUnpaid', 'as' => 'box.unpaid']); + Route::get('box/bills-paid', ['uses' => 'JsonController@boxBillsPaid', 'as' => 'box.paid']); Route::get('transaction-journals/all', ['uses' => 'JsonController@allTransactionJournals', 'as' => 'all-transaction-journals']); Route::get('transaction-journals/{what}', ['uses' => 'JsonController@transactionJournals', 'as' => 'transaction-journals']); Route::get('transaction-types', ['uses' => 'JsonController@transactionTypes', 'as' => 'transaction-types']); diff --git a/tests/Feature/Controllers/JavascriptControllerTest.php b/tests/Feature/Controllers/JavascriptControllerTest.php index bbae285845..9a44b78813 100644 --- a/tests/Feature/Controllers/JavascriptControllerTest.php +++ b/tests/Feature/Controllers/JavascriptControllerTest.php @@ -54,6 +54,8 @@ class JavascriptControllerTest extends TestCase */ public function testVariables(string $range) { + + $this->be($this->user()); $this->changeDateRange($this->user(), $range); $response = $this->get(route('javascript.variables')); diff --git a/tests/Feature/Controllers/JsonControllerTest.php b/tests/Feature/Controllers/JsonControllerTest.php index 015d5cb271..82850b9fc7 100644 --- a/tests/Feature/Controllers/JsonControllerTest.php +++ b/tests/Feature/Controllers/JsonControllerTest.php @@ -14,12 +14,14 @@ namespace Tests\Feature\Controllers; use Amount; use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Models\AccountType; +use FireflyIII\Models\Budget; use FireflyIII\Models\Category; use FireflyIII\Models\Tag; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Account\AccountTaskerInterface; use FireflyIII\Repositories\Bill\BillRepositoryInterface; +use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\Tag\TagRepositoryInterface; @@ -33,9 +35,9 @@ use Tests\TestCase; */ class JsonControllerTest extends TestCase { - /** * @covers \FireflyIII\Http\Controllers\JsonController::action + * @covers \FireflyIII\Http\Controllers\JsonController::__construct */ public function testAction() { @@ -48,6 +50,36 @@ class JsonControllerTest extends TestCase $response->assertStatus(200); } + /** + * @covers \FireflyIII\Http\Controllers\JsonController::allAccounts + */ + public function testAllAccounts() + { + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $accountRepos->shouldReceive('getAccountsByType') + ->withArgs([[AccountType::REVENUE, AccountType::EXPENSE, AccountType::BENEFICIARY, AccountType::DEFAULT, AccountType::ASSET]]) + ->andReturn(new Collection); + + $this->be($this->user()); + $response = $this->get(route('json.all-accounts')); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\JsonController::allTransactionJournals() + */ + public function testAllTransactionJournals() + { + $collector = $this->mock(JournalCollectorInterface::class); + $collector->shouldReceive('setLimit')->withArgs([100])->andReturnSelf(); + $collector->shouldReceive('setPage')->withArgs([1])->andReturnSelf(); + $collector->shouldReceive('getJournals')->andReturn(new Collection); + + $this->be($this->user()); + $response = $this->get(route('json.all-transaction-journals')); + $response->assertStatus(200); + } + /** * @covers \FireflyIII\Http\Controllers\JsonController::boxBillsPaid */ @@ -57,12 +89,12 @@ class JsonControllerTest extends TestCase $billRepos = $this->mock(BillRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); - $billRepos->shouldReceive('getBillsUnpaidInRange')->andReturn('100'); + $billRepos->shouldReceive('getBillsPaidInRange')->andReturn('-100'); $this->be($this->user()); $response = $this->get(route('json.box.paid')); $response->assertStatus(200); - $response->assertExactJson(['amount' => Amount::format('100', false), 'amount_raw' => '100', 'box' => 'bills-unpaid']); + $response->assertExactJson(['amount' => Amount::format('100', false), 'amount_raw' => '100', 'box' => 'bills-paid']); } /** @@ -74,13 +106,13 @@ class JsonControllerTest extends TestCase $billRepos = $this->mock(BillRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); - $billRepos->shouldReceive('getBillsPaidInRange')->andReturn('-100'); + $billRepos->shouldReceive('getBillsUnpaidInRange')->andReturn('100'); $this->be($this->user()); $response = $this->get(route('json.box.unpaid')); $response->assertStatus(200); - $response->assertExactJson(['amount' => Amount::format('100', false), 'amount_raw' => '100', 'box' => 'bills-paid']); + $response->assertExactJson(['amount' => Amount::format('100', false), 'amount_raw' => '100', 'box' => 'bills-unpaid']); } /** @@ -127,6 +159,23 @@ class JsonControllerTest extends TestCase $response->assertExactJson(['amount' => Amount::format('100', false), 'amount_raw' => '100', 'box' => 'out']); } + /** + * @covers \FireflyIII\Http\Controllers\JsonController::budgets + */ + public function testBudgets() + { + // mock stuff + $budget = factory(Budget::class)->make(); + $categoryRepos = $this->mock(BudgetRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); + $categoryRepos->shouldReceive('getBudgets')->andReturn(new Collection([$budget])); + $this->be($this->user()); + $response = $this->get(route('json.budgets')); + $response->assertStatus(200); + $response->assertExactJson([$budget->name]); + } + /** * @covers \FireflyIII\Http\Controllers\JsonController::categories */ @@ -231,6 +280,22 @@ class JsonControllerTest extends TestCase $response->assertStatus(200); } + /** + * @covers \FireflyIII\Http\Controllers\JsonController::transactionTypes + */ + public function testTransactionTypes() + { + // mock stuff + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); + $journalRepos->shouldReceive('getTransactionTypes')->once()->andReturn(new Collection); + + $this->be($this->user()); + $response = $this->get(route('json.transaction-types', ['deposit'])); + $response->assertStatus(200); + $response->assertExactJson([]); + } + /** * @covers \FireflyIII\Http\Controllers\JsonController::transactionJournals */ diff --git a/tests/Feature/Controllers/PreferencesControllerTest.php b/tests/Feature/Controllers/PreferencesControllerTest.php index 394fb4c10b..b64e916edb 100644 --- a/tests/Feature/Controllers/PreferencesControllerTest.php +++ b/tests/Feature/Controllers/PreferencesControllerTest.php @@ -38,6 +38,7 @@ class PreferencesControllerTest extends TestCase $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); $google->shouldReceive('generateSecretKey')->andReturn('secret'); $google->shouldReceive('getQRCodeInline')->andReturn('long-data-url'); + $this->be($this->user()); $response = $this->get(route('preferences.code')); $response->assertStatus(200); diff --git a/tests/Feature/Controllers/ReportControllerTest.php b/tests/Feature/Controllers/ReportControllerTest.php index 28484e09d4..f79d9c251b 100644 --- a/tests/Feature/Controllers/ReportControllerTest.php +++ b/tests/Feature/Controllers/ReportControllerTest.php @@ -19,9 +19,15 @@ use FireflyIII\Generator\Report\Standard\YearReportGenerator as SYRG; use FireflyIII\Generator\Report\Tag\YearReportGenerator as TYRG; use FireflyIII\Helpers\Report\ReportHelperInterface; use FireflyIII\Models\AccountType; +use FireflyIII\Models\Budget; +use FireflyIII\Models\Category; +use FireflyIII\Models\Tag; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; +use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use FireflyIII\Repositories\Tag\TagRepositoryInterface; use Illuminate\Support\Collection; use Tests\TestCase; @@ -130,6 +136,7 @@ class ReportControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\ReportController::options + * @covers \FireflyIII\Http\Controllers\ReportController::noReportOptions */ public function testOptions() { @@ -149,35 +156,48 @@ class ReportControllerTest extends TestCase { $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); + $budgetRepos = $this->mock(BudgetRepositoryInterface::class); + $budget = factory(Budget::class)->make(); + $budgetRepos->shouldReceive('getBudgets')->andReturn(new Collection([$budget])); + $this->be($this->user()); $response = $this->get(route('reports.options', ['budget'])); $response->assertStatus(200); + $response->assertSee($budget->name); } /** * @covers \FireflyIII\Http\Controllers\ReportController::options + * @covers \FireflyIII\Http\Controllers\ReportController::categoryReportOptions */ public function testOptionsCategory() { $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); + $categoryRepos = $this->mock(CategoryRepositoryInterface::class); + $category = factory(Category::class)->make(); + $categoryRepos->shouldReceive('getCategories')->andReturn(new Collection([$category])); $this->be($this->user()); - $response = $this->get(route('reports.options', ['default'])); + $response = $this->get(route('reports.options', ['category'])); $response->assertStatus(200); } /** * @covers \FireflyIII\Http\Controllers\ReportController::options + * @covers \FireflyIII\Http\Controllers\ReportController::tagReportOptions */ public function testOptionsTag() { $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); + $tag = factory(Tag::class)->make(); + $tagRepos = $this->mock(TagRepositoryInterface::class); + $tagRepos->shouldReceive('get')->andReturn(new Collection([$tag])); $this->be($this->user()); - $response = $this->get(route('reports.options', ['default'])); + $response = $this->get(route('reports.options', ['tag'])); $response->assertStatus(200); } @@ -195,7 +215,7 @@ class ReportControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\ReportController::categoryReport + * @covers \FireflyIII\Http\Controllers\ReportController::tagReport */ public function testTagReport() { diff --git a/tests/Feature/Controllers/RuleControllerTest.php b/tests/Feature/Controllers/RuleControllerTest.php index ec484fadc5..7d4c6d957a 100644 --- a/tests/Feature/Controllers/RuleControllerTest.php +++ b/tests/Feature/Controllers/RuleControllerTest.php @@ -36,7 +36,7 @@ class RuleControllerTest extends TestCase public function testCreate() { // mock stuff - $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); $this->be($this->user()); @@ -51,7 +51,7 @@ class RuleControllerTest extends TestCase public function testDelete() { // mock stuff - $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); $this->be($this->user()); @@ -66,8 +66,8 @@ class RuleControllerTest extends TestCase public function testDestroy() { // mock stuff - $repository = $this->mock(RuleRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(RuleRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('destroy'); @@ -85,8 +85,8 @@ class RuleControllerTest extends TestCase public function testDown() { // mock stuff - $repository = $this->mock(RuleRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(RuleRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('moveDown'); @@ -102,8 +102,8 @@ class RuleControllerTest extends TestCase public function testEdit() { // mock stuff - $repository = $this->mock(RuleRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(RuleRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('getPrimaryTrigger')->andReturn(new Rule); @@ -128,11 +128,9 @@ class RuleControllerTest extends TestCase $ruleGroupRepos->shouldReceive('store'); $repository->shouldReceive('getFirstRuleGroup')->andReturn(new RuleGroup); $ruleGroupRepos->shouldReceive('getRuleGroupsWithRules')->andReturn(new Collection); - $repository->shouldReceive('count')->andReturn(0); $repository->shouldReceive('store'); - $this->be($this->user()); $response = $this->get(route('rules.index')); $response->assertStatus(200); @@ -145,14 +143,11 @@ class RuleControllerTest extends TestCase public function testReorderRuleActions() { // mock stuff - $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(RuleRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); - $data = [ - 'triggers' => [1, 2, 3], - ]; - - $repository = $this->mock(RuleRepositoryInterface::class); + $data = ['triggers' => [1, 2, 3],]; $repository->shouldReceive('reorderRuleActions'); $this->be($this->user()); @@ -166,14 +161,11 @@ class RuleControllerTest extends TestCase public function testReorderRuleTriggers() { // mock stuff - $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(RuleRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); - - $data = [ - 'triggers' => [1, 2, 3], - ]; - - $repository = $this->mock(RuleRepositoryInterface::class); + $data = ['triggers' => [1, 2, 3],]; $repository->shouldReceive('reorderRuleTriggers'); $this->be($this->user()); @@ -187,10 +179,13 @@ class RuleControllerTest extends TestCase public function testStore() { // mock stuff + $repository = $this->mock(RuleRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); $ruleGroupRepos = $this->mock(RuleGroupRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); $ruleGroupRepos->shouldReceive('find')->andReturn(new RuleGroup)->once(); + $repository->shouldReceive('store')->andReturn(new Rule); $this->session(['rules.create.url' => 'http://localhost']); $data = [ @@ -212,10 +207,6 @@ class RuleControllerTest extends TestCase 1 => 'C', ], ]; - - $repository = $this->mock(RuleRepositoryInterface::class); - $repository->shouldReceive('store')->andReturn(new Rule); - $this->be($this->user()); $response = $this->post(route('rules.store', [1]), $data); $response->assertStatus(302); @@ -261,10 +252,13 @@ class RuleControllerTest extends TestCase public function testUpdate() { // mock stuff + $repository = $this->mock(RuleRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); $ruleGroupRepos = $this->mock(RuleGroupRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); $ruleGroupRepos->shouldReceive('find')->andReturn(new RuleGroup)->once(); + $repository->shouldReceive('update'); $data = [ 'rule_group_id' => 1, @@ -286,10 +280,6 @@ class RuleControllerTest extends TestCase ], ]; $this->session(['rules.edit.url' => 'http://localhost']); - - $repository = $this->mock(RuleRepositoryInterface::class); - $repository->shouldReceive('update'); - $this->be($this->user()); $response = $this->post(route('rules.update', [1]), $data); $response->assertStatus(302); diff --git a/tests/Feature/Controllers/RuleGroupControllerTest.php b/tests/Feature/Controllers/RuleGroupControllerTest.php index 54e523ddd8..7f962e3ff1 100644 --- a/tests/Feature/Controllers/RuleGroupControllerTest.php +++ b/tests/Feature/Controllers/RuleGroupControllerTest.php @@ -12,6 +12,7 @@ declare(strict_types = 1); namespace Tests\Feature\Controllers; use Carbon\Carbon; +use FireflyIII\Jobs\ExecuteRuleGroupOnExistingTransactions; use FireflyIII\Models\RuleGroup; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface; @@ -30,11 +31,14 @@ class RuleGroupControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\RuleGroupController::create + * @covers \FireflyIII\Http\Controllers\RuleGroupController::__construct */ public function testCreate() { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(RuleGroupRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); $this->be($this->user()); @@ -51,6 +55,7 @@ class RuleGroupControllerTest extends TestCase // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); $repository = $this->mock(RuleGroupRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('get')->andReturn(new Collection); @@ -67,8 +72,9 @@ class RuleGroupControllerTest extends TestCase { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(RuleGroupRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); - $repository = $this->mock(RuleGroupRepositoryInterface::class); $repository->shouldReceive('destroy'); $this->session(['rule-groups.delete.url' => 'http://localhost']); @@ -87,6 +93,7 @@ class RuleGroupControllerTest extends TestCase // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); $repository = $this->mock(RuleGroupRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('moveDown'); @@ -103,8 +110,11 @@ class RuleGroupControllerTest extends TestCase { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(RuleGroupRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); + $this->be($this->user()); $response = $this->get(route('rule-groups.edit', [1])); $response->assertStatus(200); @@ -117,11 +127,14 @@ class RuleGroupControllerTest extends TestCase public function testExecute() { // mock stuff - $accountRepos = $this->mock(AccountRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(RuleGroupRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); $journalRepos->shouldReceive('first')->andReturn(new TransactionJournal); $accountRepos->shouldReceive('getAccountsById')->andReturn(new Collection); + $this->expectsJobs(ExecuteRuleGroupOnExistingTransactions::class); + $this->session(['first' => new Carbon('2010-01-01')]); $data = [ 'accounts' => [1], @@ -142,8 +155,9 @@ class RuleGroupControllerTest extends TestCase public function testSelectTransactions() { // mock stuff - $accountRepos = $this->mock(AccountRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(RuleGroupRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection); @@ -161,16 +175,18 @@ class RuleGroupControllerTest extends TestCase // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); $repository = $this->mock(RuleGroupRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); $this->session(['rule-groups.create.url' => 'http://localhost']); + $repository->shouldReceive('store')->andReturn(new RuleGroup); + $repository->shouldReceive('find')->andReturn(new RuleGroup); $data = [ 'title' => 'A', 'description' => '', ]; - $repository->shouldReceive('store')->andReturn(new RuleGroup); - $repository->shouldReceive('find')->andReturn(new RuleGroup); + $this->be($this->user()); $response = $this->post(route('rule-groups.store', [1]), $data); @@ -186,6 +202,7 @@ class RuleGroupControllerTest extends TestCase // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); $repository = $this->mock(RuleGroupRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('moveUp'); @@ -203,6 +220,7 @@ class RuleGroupControllerTest extends TestCase // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); $repository = $this->mock(RuleGroupRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); $data = [ From fd1f06c2cb0e42b213ce2672e2ec7c4b4e1bbc32 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 16 Mar 2017 21:00:34 +0100 Subject: [PATCH 074/151] Small fix. --- app/Support/Amount.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Support/Amount.php b/app/Support/Amount.php index 4db387fc99..3e6f5694d3 100644 --- a/app/Support/Amount.php +++ b/app/Support/Amount.php @@ -138,7 +138,7 @@ class Amount $info = localeconv(); Log::debug('Localeconv is', $info); Log::debug(sprintf('Now calling number_format(%f, %d, "%s", "%s")', $float, $format->decimal_places, $info['mon_decimal_point'], $info['mon_thousands_sep'])); - Log::debug('Decimal places raw: %s', var_export($format->decimal_places, true)); + Log::debug(sprintf('Decimal places raw: %s', var_export($format->decimal_places, true))); $formatted = number_format($float, intval($format->decimal_places), $info['mon_decimal_point'], $info['mon_thousands_sep']); From e2f3788ff5e7f1587b1cb1c4941397b391be24cb Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 17 Mar 2017 16:34:57 +0100 Subject: [PATCH 075/151] Expand tests. --- app/Http/Controllers/CategoryController.php | 4 +++- app/Http/Controllers/PiggyBankController.php | 3 ++- .../Controllers/TransactionController.php | 8 ++++++-- database/factories/ModelFactory.php | 15 +++++++++++++++ .../Controllers/CategoryControllerTest.php | 7 +++++++ .../Chart/AccountControllerTest.php | 19 +++++++++++++++++++ .../Controllers/PiggyBankControllerTest.php | 6 +++++- .../Transaction/SingleControllerTest.php | 2 ++ .../Controllers/TransactionControllerTest.php | 4 ++++ 9 files changed, 63 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index eb91a6bf53..d76c829e2a 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -438,8 +438,9 @@ class CategoryController extends Controller return $cache->get(); // @codeCoverageIgnore } - Log::debug('Going to get period expenses and incomes.'); + Log::debug(sprintf('Going to get period expenses and incomes between %s and %s.', $start->format('Y-m-d'), $end->format('Y-m-d'))); while ($end >= $start) { + Log::debug('Loop!'); $end = Navigation::startOfPeriod($end, $range); $currentEnd = Navigation::endOfPeriod($end, $range); @@ -483,6 +484,7 @@ class CategoryController extends Controller ); $end = Navigation::subtractPeriod($end, $range, 1); } + Log::debug('End of loops'); $cache->store($entries); return $entries; diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php index 0de48942a4..213fcd8350 100644 --- a/app/Http/Controllers/PiggyBankController.php +++ b/app/Http/Controllers/PiggyBankController.php @@ -229,7 +229,8 @@ class PiggyBankController extends Controller 'sumOfTargets' => $piggyBank->targetamount, 'leftToSave' => $piggyBank->leftToSave, ]; - } else { + } + if (isset($accounts[$account->id])) { $accounts[$account->id]['sumOfSaved'] = bcadd($accounts[$account->id]['sumOfSaved'], strval($piggyBank->savedSoFar)); $accounts[$account->id]['sumOfTargets'] = bcadd($accounts[$account->id]['sumOfTargets'], $piggyBank->targetamount); $accounts[$account->id]['leftToSave'] = bcadd($accounts[$account->id]['leftToSave'], $piggyBank->leftToSave); diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index b0fc0e28ee..01066d5b8b 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -212,11 +212,12 @@ class TransactionController extends Controller $cache->addProperty('transaction-list-entries'); if ($cache->has()) { - return $cache->get(); // @codeCoverageIgnore + return $cache->get(); // @codeCoverageIgnore } - Log::debug('Going to get period expenses and incomes.'); + Log::debug(sprintf('Going to get period expenses and incomes between %s and %s.', $start->format('Y-m-d'), $end->format('Y-m-d'))); while ($end >= $start) { + Log::debug('Loop start!'); $end = Navigation::startOfPeriod($end, $range); $currentEnd = Navigation::endOfPeriod($end, $range); @@ -238,6 +239,7 @@ class TransactionController extends Controller 'transferred' => 0, 'date' => clone $end, ]; + Log::debug(sprintf('What is %s', $what)); switch ($what) { default: throw new FireflyException(sprintf('Cannot handle "%s"', $what)); @@ -249,6 +251,7 @@ class TransactionController extends Controller break; case 'transfers': case 'transfer': + Log::debug('HERE'); $array['transferred'] = Steam::positive($sum); break; @@ -256,6 +259,7 @@ class TransactionController extends Controller $entries->push($array); $end = Navigation::subtractPeriod($end, $range, 1); } + Log::debug('End of loop'); $cache->store($entries); return $entries; diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php index 85729c895c..d727a45a98 100644 --- a/database/factories/ModelFactory.php +++ b/database/factories/ModelFactory.php @@ -33,6 +33,21 @@ $factory->define( } ); +$factory->define( + FireflyIII\Models\PiggyBank::class, function (Faker\Generator $faker) { + return [ + 'id' => $faker->numberBetween(1, 10), + 'account_id' => $faker->numberBetween(1, 10), + 'name' => $faker->words(3, true), + 'target_amount' => '1000.00', + 'startdate' => '2017-01-01', + 'order' => 1, + 'active' => 1, + 'encrypted' => 0, + ]; +} +); + $factory->define( FireflyIII\Models\Tag::class, function (Faker\Generator $faker) { return [ diff --git a/tests/Feature/Controllers/CategoryControllerTest.php b/tests/Feature/Controllers/CategoryControllerTest.php index 5c4ed07c85..53fdbe9db9 100644 --- a/tests/Feature/Controllers/CategoryControllerTest.php +++ b/tests/Feature/Controllers/CategoryControllerTest.php @@ -20,6 +20,7 @@ use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; +use Steam; use Tests\TestCase; class CategoryControllerTest extends TestCase @@ -114,6 +115,7 @@ class CategoryControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\CategoryController::noCategory + * @covers \FireflyIII\Http\Controllers\CategoryController::noCategoryPeriodEntries * @dataProvider dateRangeProvider * * @param string $range @@ -137,6 +139,7 @@ class CategoryControllerTest extends TestCase $collector->shouldReceive('disableInternalFilter')->andReturnSelf(); $collector->shouldReceive('setLimit')->andReturnSelf(); + Steam::shouldReceive('positive')->once()->andReturn('1'); $this->be($this->user()); $this->changeDateRange($this->user(), $range); @@ -148,6 +151,7 @@ class CategoryControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\CategoryController::noCategory + * @covers \FireflyIII\Http\Controllers\CategoryController::noCategoryPeriodEntries * @dataProvider dateRangeProvider * * @param string $range @@ -181,6 +185,7 @@ class CategoryControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\CategoryController::noCategory + * @covers \FireflyIII\Http\Controllers\CategoryController::noCategoryPeriodEntries * @dataProvider dateRangeProvider * * @param string $range @@ -204,6 +209,8 @@ class CategoryControllerTest extends TestCase $collector->shouldReceive('disableInternalFilter')->andReturnSelf(); $collector->shouldReceive('setLimit')->andReturnSelf(); + Steam::shouldReceive('positive')->once()->andReturn('1'); + $this->be($this->user()); $this->changeDateRange($this->user(), $range); $response = $this->get(route('categories.no-category', ['2016-01-01'])); diff --git a/tests/Feature/Controllers/Chart/AccountControllerTest.php b/tests/Feature/Controllers/Chart/AccountControllerTest.php index a6468fef80..b172f22278 100644 --- a/tests/Feature/Controllers/Chart/AccountControllerTest.php +++ b/tests/Feature/Controllers/Chart/AccountControllerTest.php @@ -31,6 +31,24 @@ use Tests\TestCase; */ class AccountControllerTest extends TestCase { + + /** + * @covers \FireflyIII\Http\Controllers\Chart\AccountController::all + */ + public function testAll() + { + $generator = $this->mock(GeneratorInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + + $accountRepos->shouldReceive('oldestJournalDate')->once()->andReturn(Carbon::now()->subMonth()); + Steam::shouldReceive('balanceInRange')->andReturn(['2012-01-01' => '0']); + $generator->shouldReceive('singleSet')->andReturn([]); + + $this->be($this->user()); + $response = $this->get(route('chart.account.all', [1])); + $response->assertStatus(200); + } + /** * @covers \FireflyIII\Http\Controllers\Chart\AccountController::expenseAccounts * @covers \FireflyIII\Generator\Chart\Basic\GeneratorInterface::singleSet @@ -188,6 +206,7 @@ class AccountControllerTest extends TestCase { $generator = $this->mock(GeneratorInterface::class); $generator->shouldReceive('multiSet')->andreturn([]); + Steam::shouldReceive('balanceInRange')->andReturn(['2012-01-01' => '0']); $this->be($this->user()); $response = $this->get(route('chart.account.report', ['1', '20120101', '20120131'])); diff --git a/tests/Feature/Controllers/PiggyBankControllerTest.php b/tests/Feature/Controllers/PiggyBankControllerTest.php index da2b048a2f..c5342504d4 100644 --- a/tests/Feature/Controllers/PiggyBankControllerTest.php +++ b/tests/Feature/Controllers/PiggyBankControllerTest.php @@ -19,6 +19,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; use Illuminate\Support\Collection; +use Steam; use Tests\TestCase; /** @@ -141,8 +142,11 @@ class PiggyBankControllerTest extends TestCase // mock stuff $repository = $this->mock(PiggyBankRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $piggyBank = factory(PiggyBank::class)->make(); $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); - $repository->shouldReceive('getPiggyBanks')->andReturn(new Collection); + $repository->shouldReceive('getPiggyBanks')->andReturn(new Collection([$piggyBank])); + + Steam::shouldReceive('balanceIgnoreVirtual')->twice()->andReturn('1'); $this->be($this->user()); $response = $this->get(route('piggy-banks.index')); diff --git a/tests/Feature/Controllers/Transaction/SingleControllerTest.php b/tests/Feature/Controllers/Transaction/SingleControllerTest.php index c8dd9095c3..684a2bb311 100644 --- a/tests/Feature/Controllers/Transaction/SingleControllerTest.php +++ b/tests/Feature/Controllers/Transaction/SingleControllerTest.php @@ -26,6 +26,7 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; use Illuminate\Support\Collection; use Illuminate\Support\MessageBag; +use Steam; use Tests\TestCase; /** @@ -53,6 +54,7 @@ class SingleControllerTest extends TestCase */ public function testCreate() { + Steam::shouldReceive('phpBytes')->andReturn(2048); $repository = $this->mock(AccountRepositoryInterface::class); $repository->shouldReceive('getActiveAccountsByType')->once()->withArgs([[AccountType::DEFAULT, AccountType::ASSET]])->andReturn(new Collection); $budgetRepos = $this->mock(BudgetRepositoryInterface::class); diff --git a/tests/Feature/Controllers/TransactionControllerTest.php b/tests/Feature/Controllers/TransactionControllerTest.php index a2f01787ae..4cc5face03 100644 --- a/tests/Feature/Controllers/TransactionControllerTest.php +++ b/tests/Feature/Controllers/TransactionControllerTest.php @@ -17,6 +17,7 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\Journal\JournalTaskerInterface; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; +use Steam; use Tests\TestCase; class TransactionControllerTest extends TestCase @@ -45,6 +46,8 @@ class TransactionControllerTest extends TestCase $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); $collector->shouldReceive('getJournals')->andReturn(new Collection); + Steam::shouldReceive('positive')->once()->andReturn('1'); + $this->be($this->user()); $response = $this->get(route('transactions.index', ['transfer'])); $response->assertStatus(200); @@ -103,6 +106,7 @@ class TransactionControllerTest extends TestCase $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); $collector->shouldReceive('getJournals')->andReturn(new Collection); + Steam::shouldReceive('positive')->once()->andReturn('1'); $this->be($this->user()); $response = $this->get(route('transactions.index', ['transfer', '2016-01-01'])); From 97f67912f4697bfc043fa19b353d3ad224a58021 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 18 Mar 2017 07:45:40 +0100 Subject: [PATCH 076/151] Remove logging --- app/Support/Amount.php | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/app/Support/Amount.php b/app/Support/Amount.php index 3e6f5694d3..1bd525f5f7 100644 --- a/app/Support/Amount.php +++ b/app/Support/Amount.php @@ -18,7 +18,6 @@ use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionJournal; use Illuminate\Support\Collection; -use Log; use Preferences as Prefs; /** @@ -98,7 +97,6 @@ class Amount // alternative is currency before amount $format = $pos_a . $pos_b . '%s' . $pos_c . $space . $pos_d . '%v' . $pos_e; } - Log::debug(sprintf('Final format: "%s"', $format)); return $format; } @@ -111,8 +109,6 @@ class Amount */ public function format(string $amount, bool $coloured = true): string { - Log::debug(sprintf('Now in format("%s", %s).', $amount, var_export($coloured, true))); - return $this->formatAnything($this->getDefaultCurrency(), $amount, $coloured); } @@ -128,18 +124,11 @@ class Amount */ public function formatAnything(TransactionCurrency $format, string $amount, bool $coloured = true): string { - Log::debug(sprintf('Now in formatAnything($format, "%s",%s)', $amount, var_export($coloured, true))); - Log::debug('Currency $format: ', $format->toArray()); $locale = explode(',', trans('config.locale')); $locale = array_map('trim', $locale); - Log::debug('Locale is ', $locale); setlocale(LC_MONETARY, $locale); $float = round($amount, 12); $info = localeconv(); - Log::debug('Localeconv is', $info); - Log::debug(sprintf('Now calling number_format(%f, %d, "%s", "%s")', $float, $format->decimal_places, $info['mon_decimal_point'], $info['mon_thousands_sep'])); - Log::debug(sprintf('Decimal places raw: %s', var_export($format->decimal_places, true))); - $formatted = number_format($float, intval($format->decimal_places), $info['mon_decimal_point'], $info['mon_thousands_sep']); // some complicated switches to format the amount correctly: @@ -267,33 +256,23 @@ class Amount } /** - * @return \FireflyIII\Models\TransactionCurrency + * @return TransactionCurrency + * @throws FireflyException */ public function getDefaultCurrency(): TransactionCurrency { - Log::debug('Now in getDefaultCurrency()'); $cache = new CacheProperties; $cache->addProperty('getDefaultCurrency'); if ($cache->has()) { - Log::debug('Return cache value: ', $cache->get()->toArray()); - return $cache->get(); // @codeCoverageIgnore } - Log::debug('getDefaultCurrency() is not in cache.'); $currencyPreference = Prefs::get('currencyPreference', config('firefly.default_currency', 'EUR')); - Log::debug('currencyPreference is', $currencyPreference->toArray()); - $currency = TransactionCurrency::where('code', $currencyPreference->data)->first(); - + $currency = TransactionCurrency::where('code', $currencyPreference->data)->first(); if (is_null($currency)) { - Log::debug('Currency is NULL!'); throw new FireflyException(sprintf('No currency found with code "%s"', $currencyPreference->data)); } - Log::debug('Currency is ', $currency->toArray()); - $cache->store($currency); - Log::debug('Return $currency'); - return $currency; } From a25a499ed4d946b9c12109e270523355c340e508 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 18 Mar 2017 07:45:52 +0100 Subject: [PATCH 077/151] Code cleanup --- app/Models/Preference.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Preference.php b/app/Models/Preference.php index f5a81dd909..f246650b48 100644 --- a/app/Models/Preference.php +++ b/app/Models/Preference.php @@ -13,10 +13,10 @@ declare(strict_types = 1); namespace FireflyIII\Models; -use Crypt; use FireflyIII\Exceptions\FireflyException; use Illuminate\Contracts\Encryption\DecryptException; use Illuminate\Database\Eloquent\Model; +use Crypt; use Log; /** From 68be58c9f2f42a6fbc4c62cd5c91db89f642bfa4 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 18 Mar 2017 07:46:14 +0100 Subject: [PATCH 078/151] Line chart --- public/js/ff/budgets/show.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/public/js/ff/budgets/show.js b/public/js/ff/budgets/show.js index 07cf18ed9e..5831c82031 100644 --- a/public/js/ff/budgets/show.js +++ b/public/js/ff/budgets/show.js @@ -8,11 +8,15 @@ * See the LICENSE file for details. */ -/** global: budgetChartUri */ +/** global: budgetChartUri,budgetLimitID */ $(function () { "use strict"; - - columnChart(budgetChartUri, 'budgetOverview'); + if (budgetLimitID > 0) { + lineChart(budgetChartUri, 'budgetOverview'); + } + if (budgetLimitID == 0) { + columnChart(budgetChartUri, 'budgetOverview'); + } }); From c62e3dcb78c4bdf1bb4c8b6989c20c5cd23f8c91 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 18 Mar 2017 07:46:42 +0100 Subject: [PATCH 079/151] Code for #595 --- app/Http/Controllers/CategoryController.php | 301 +++++++++++------- resources/lang/en_US/firefly.php | 3 + resources/views/budgets/show.twig | 5 +- resources/views/categories/show.twig | 67 ++-- routes/web.php | 4 +- .../Controllers/AccountControllerTest.php | 6 +- .../Controllers/CategoryControllerTest.php | 24 +- 7 files changed, 242 insertions(+), 168 deletions(-) diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index d76c829e2a..b625c634b8 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -234,91 +234,147 @@ class CategoryController extends Controller * @param Request $request * @param JournalCollectorInterface $collector * @param Category $category + * @param string $moment * * @return View */ - public function show(Request $request, JournalCollectorInterface $collector, Category $category) + public function show(Request $request, JournalCollectorInterface $collector, Category $category, string $moment = '') { - $range = Preferences::get('viewRange', '1M')->data; - $start = session('start', Navigation::startOfPeriod(new Carbon, $range)); - $end = session('end', Navigation::endOfPeriod(new Carbon, $range)); - $hideCategory = true; // used in list. - $page = intval($request->get('page')) === 0 ? 1 : intval($request->get('page')); - $pageSize = intval(Preferences::get('transactionPageSize', 50)->data); + // default values: + /** @var CategoryRepositoryInterface $repository */ + $repository = app(CategoryRepositoryInterface::class); $subTitle = $category->name; $subTitleIcon = 'fa-bar-chart'; - $entries = $this->getGroupedEntries($category); - $method = 'default'; - - // get journals - $collector->setLimit($pageSize)->setPage($page)->setAllAssetAccounts()->setRange($start, $end)->setCategory($category)->withBudgetInformation(); - $journals = $collector->getPaginatedJournals(); - $journals->setPath('categories/show/' . $category->id); + $page = intval($request->get('page')) == 0 ? 1 : intval($request->get('page')); + $pageSize = intval(Preferences::get('transactionPageSize', 50)->data); + $count = 0; + $loop = 0; + $range = Preferences::get('viewRange', '1M')->data; + $start = null; + $end = null; + $periods = new Collection; - return view('categories.show', compact('category', 'method', 'journals', 'entries', 'hideCategory', 'subTitle', 'subTitleIcon', 'start', 'end')); - } - - /** - * @param Request $request - * @param CategoryRepositoryInterface $repository - * @param Category $category - * - * @return View - */ - public function showAll(Request $request, CategoryRepositoryInterface $repository, Category $category) - { - $range = Preferences::get('viewRange', '1M')->data; - $start = $repository->firstUseDate($category); - if ($start->year == 1900) { - $start = new Carbon; + // prep for "all" view. + if ($moment === 'all') { + $subTitle = trans('firefly.all_journals_for_category', ['name' => $category->name]); + $start = $repository->firstUseDate($category); + $end = new Carbon; } - $end = Navigation::endOfPeriod(new Carbon, $range); - $subTitle = $category->name; - $subTitleIcon = 'fa-bar-chart'; - $hideCategory = true; // used in list. - $page = intval($request->get('page')) === 0 ? 1 : intval($request->get('page')); - $pageSize = intval(Preferences::get('transactionPageSize', 50)->data); - $method = 'all'; - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector->setLimit($pageSize)->setPage($page)->setAllAssetAccounts()->setCategory($category)->withBudgetInformation(); - $journals = $collector->getPaginatedJournals(); - $journals->setPath('categories/show/' . $category->id . '/all'); + // prep for "specific date" view. + if (strlen($moment) > 0 && $moment !== 'all') { + $start = new Carbon($moment); + $end = Navigation::endOfPeriod($start, $range); + $subTitle = trans( + 'firefly.journals_in_period_for_category', + ['name' => $category->name, + 'start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] + ); + $periods = $this->periodEntries($category); + } - return view('categories.show', compact('category', 'method', 'journals', 'hideCategory', 'subTitle', 'subTitleIcon', 'start', 'end')); + // prep for current period + if (strlen($moment) === 0) { + $start = clone session('start', Navigation::startOfPeriod(new Carbon, $range)); + $end = clone session('end', Navigation::endOfPeriod(new Carbon, $range)); + $periods = $this->periodEntries($category); + $subTitle = trans( + 'firefly.journals_in_period_for_category', + ['name' => $category->name,'start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] + ); + } + // grab journals, but be prepared to jump a period back to get the right ones: + Log::info('Now at transaction loop start.'); + while ($count === 0 && $loop < 3) { + $loop++; + Log::info('Count is zero, search for journals.'); + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withOpposingAccount() + ->setCategory($category)->withBudgetInformation()->withCategoryInformation(); + $journals = $collector->getPaginatedJournals(); + $journals->setPath('categories/show/' . $category->id); + $count = $journals->getCollection()->count(); + if ($count === 0) { + $start->subDay(); + $start = Navigation::startOfPeriod($start, $range); + $end = Navigation::endOfPeriod($start, $range); + Log::info(sprintf('Count is still zero, go back in time to "%s" and "%s"!', $start->format('Y-m-d'), $end->format('Y-m-d'))); + } + } + + // fix title: + if (((strlen($moment) > 0 && $moment !== 'all') || strlen($moment) === 0) && $count > 0) { + $subTitle = trans( + 'firefly.journals_in_period_for_category', + ['name' => $category->name,'start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] + ); + } + + return view('categories.show', compact('category', 'moment', 'journals', 'periods', 'subTitle', 'subTitleIcon', 'start', 'end')); } - /** - * @param Request $request - * @param Category $category - * @param string $date - * - * @return View - */ - public function showByDate(Request $request, Category $category, string $date) - { - $carbon = new Carbon($date); - $range = Preferences::get('viewRange', '1M')->data; - $start = Navigation::startOfPeriod($carbon, $range); - $end = Navigation::endOfPeriod($carbon, $range); - $subTitle = $category->name; - $subTitleIcon = 'fa-bar-chart'; - $hideCategory = true; // used in list. - $page = intval($request->get('page')) === 0 ? 1 : intval($request->get('page')); - $pageSize = intval(Preferences::get('transactionPageSize', 50)->data); - $entries = $this->getGroupedEntries($category); - $method = 'date'; - - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector->setLimit($pageSize)->setPage($page)->setAllAssetAccounts()->setRange($start, $end)->setCategory($category)->withBudgetInformation(); - $journals = $collector->getPaginatedJournals(); - $journals->setPath('categories/show/' . $category->id . '/' . $date); - - return view('categories.show', compact('category', 'method', 'entries', 'journals', 'hideCategory', 'subTitle', 'subTitleIcon', 'start', 'end')); - } + // /** + // * @param Request $request + // * @param CategoryRepositoryInterface $repository + // * @param Category $category + // * + // * @return View + // */ + // public function showAll(Request $request, CategoryRepositoryInterface $repository, Category $category) + // { + // $range = Preferences::get('viewRange', '1M')->data; + // $start = $repository->firstUseDate($category); + // if ($start->year == 1900) { + // $start = new Carbon; + // } + // $end = Navigation::endOfPeriod(new Carbon, $range); + // $subTitle = $category->name; + // $subTitleIcon = 'fa-bar-chart'; + // $hideCategory = true; // used in list. + // $page = intval($request->get('page')) === 0 ? 1 : intval($request->get('page')); + // $pageSize = intval(Preferences::get('transactionPageSize', 50)->data); + // $method = 'all'; + // + // /** @var JournalCollectorInterface $collector */ + // $collector = app(JournalCollectorInterface::class); + // $collector->setLimit($pageSize)->setPage($page)->setAllAssetAccounts()->setCategory($category)->withBudgetInformation(); + // $journals = $collector->getPaginatedJournals(); + // $journals->setPath('categories/show/' . $category->id . '/all'); + // + // return view('categories.show', compact('category', 'method', 'journals', 'hideCategory', 'subTitle', 'subTitleIcon', 'start', 'end')); + // } + // + // /** + // * @param Request $request + // * @param Category $category + // * @param string $date + // * + // * @return View + // */ + // public function showByDate(Request $request, Category $category, string $date) + // { + // $carbon = new Carbon($date); + // $range = Preferences::get('viewRange', '1M')->data; + // $start = Navigation::startOfPeriod($carbon, $range); + // $end = Navigation::endOfPeriod($carbon, $range); + // $subTitle = $category->name; + // $subTitleIcon = 'fa-bar-chart'; + // $hideCategory = true; // used in list. + // $page = intval($request->get('page')) === 0 ? 1 : intval($request->get('page')); + // $pageSize = intval(Preferences::get('transactionPageSize', 50)->data); + // $entries = $this->getGroupedEntries($category); + // $method = 'date'; + // + // /** @var JournalCollectorInterface $collector */ + // $collector = app(JournalCollectorInterface::class); + // $collector->setLimit($pageSize)->setPage($page)->setAllAssetAccounts()->setRange($start, $end)->setCategory($category)->withBudgetInformation(); + // $journals = $collector->getPaginatedJournals(); + // $journals->setPath('categories/show/' . $category->id . '/' . $date); + // + // return view('categories.show', compact('category', 'method', 'entries', 'journals', 'hideCategory', 'subTitle', 'subTitleIcon', 'start', 'end')); + // } /** * @param CategoryFormRequest $request @@ -368,53 +424,6 @@ class CategoryController extends Controller return redirect($this->getPreviousUri('categories.edit.uri')); } - /** - * @param Category $category - * - * @return Collection - */ - private function getGroupedEntries(Category $category): Collection - { - /** @var CategoryRepositoryInterface $repository */ - $repository = app(CategoryRepositoryInterface::class); - /** @var AccountRepositoryInterface $accountRepository */ - $accountRepository = app(AccountRepositoryInterface::class); - $accounts = $accountRepository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]); - $first = $repository->firstUseDate($category); - if ($first->year == 1900) { - $first = new Carbon; - } - $range = Preferences::get('viewRange', '1M')->data; - $first = Navigation::startOfPeriod($first, $range); - $end = Navigation::endOfX(new Carbon, $range); - $entries = new Collection; - - // properties for entries with their amounts. - $cache = new CacheProperties(); - $cache->addProperty($first); - $cache->addProperty($end); - $cache->addProperty('categories.entries'); - $cache->addProperty($category->id); - - if ($cache->has()) { - return $cache->get(); // @codeCoverageIgnore - } - while ($end >= $first) { - $end = Navigation::startOfPeriod($end, $range); - $currentEnd = Navigation::endOfPeriod($end, $range); - $spent = $repository->spentInPeriod(new Collection([$category]), $accounts, $end, $currentEnd); - $earned = $repository->earnedInPeriod(new Collection([$category]), $accounts, $end, $currentEnd); - $dateStr = $end->format('Y-m-d'); - $dateName = Navigation::periodShow($end, $range); - $entries->push([$dateStr, $dateName, $spent, $earned, clone $end]); - $end = Navigation::subtractPeriod($end, $range, 1); - } - $cache->store($entries); - - return $entries; - } - - /** * @return Collection */ @@ -490,4 +499,58 @@ class CategoryController extends Controller return $entries; } + /** + * @param Category $category + * + * @return Collection + */ + private function periodEntries(Category $category): Collection + { + /** @var CategoryRepositoryInterface $repository */ + $repository = app(CategoryRepositoryInterface::class); + /** @var AccountRepositoryInterface $accountRepository */ + $accountRepository = app(AccountRepositoryInterface::class); + $accounts = $accountRepository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]); + $first = $repository->firstUseDate($category); + if ($first->year == 1900) { + $first = new Carbon; + } + $range = Preferences::get('viewRange', '1M')->data; + $first = Navigation::startOfPeriod($first, $range); + $end = Navigation::endOfX(new Carbon, $range); + $entries = new Collection; + + // properties for entries with their amounts. + $cache = new CacheProperties(); + $cache->addProperty($first); + $cache->addProperty($end); + $cache->addProperty('categories.entries'); + $cache->addProperty($category->id); + + if ($cache->has()) { + return $cache->get(); // @codeCoverageIgnore + } + while ($end >= $first) { + $end = Navigation::startOfPeriod($end, $range); + $currentEnd = Navigation::endOfPeriod($end, $range); + $spent = $repository->spentInPeriod(new Collection([$category]), $accounts, $end, $currentEnd); + $earned = $repository->earnedInPeriod(new Collection([$category]), $accounts, $end, $currentEnd); + $dateStr = $end->format('Y-m-d'); + $dateName = Navigation::periodShow($end, $range); + $entries->push( + [ + 'string' => $dateStr, + 'name' => $dateName, + 'spent' => $spent, + 'earned' => $earned, + 'date' => clone $end, + ] + ); + $end = Navigation::subtractPeriod($end, $range, 1); + } + $cache->store($entries); + + return $entries; + } + } diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 106c8a77d7..38cea0b744 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -124,6 +124,7 @@ return [ 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end', 'transferred' => 'Transferred', 'all_withdrawal' => 'All expenses', + 'all_transactions' => 'All transactions', 'title_withdrawal_between' => 'All expenses between :start and :end', 'all_deposit' => 'All revenue', 'title_deposit_between' => 'All revenue between :start and :end', @@ -131,6 +132,8 @@ return [ 'title_transfers_between' => 'All transfers between :start and :end', 'all_transfer' => 'All transfers', 'title_transfer_between' => 'All transfers between :start and :end', + 'all_journals_for_category' => 'All transactions for category :name', + 'journals_in_period_for_category' => 'All transactions for category :name between :start and :end', // repeat frequencies: diff --git a/resources/views/budgets/show.twig b/resources/views/budgets/show.twig index e1750adff8..93f7cabe37 100644 --- a/resources/views/budgets/show.twig +++ b/resources/views/budgets/show.twig @@ -43,7 +43,7 @@

                  {{ 'transactions'|_ }}

              - {% include 'list.journals-tasker' %} + {% include 'list.journals-tasker' with {hideBudgets:true, hideBills:true} %}
              @@ -101,8 +101,9 @@ {% block scripts %}