Merge branch 'release/4.7.1.3'

app/Api/V1/Controllers/TransactionController.php

@@ -166,7 +166,7 @@ class TransactionController extends Controller
         }
 
         $transactions = $collector->getJournals();
-        $resource     = new Item($transactions->first(), new TransactionTransformer($this->parameters), 'transactions');
+        $resource     = new FractalCollection($transactions, new TransactionTransformer($this->parameters), 'transactions');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }

app/TransactionRules/Actions/ClearBudget.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace FireflyIII\TransactionRules\Actions;
 
 use FireflyIII\Models\RuleAction;
+use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use Log;
 
@@ -55,6 +56,13 @@ class ClearBudget implements ActionInterface
     {
         $journal->budgets()->detach();
         $journal->touch();
+
+        // also remove categories from transactions:
+        /** @var Transaction $transaction */
+        foreach($journal->transactions as $transaction) {
+            $transaction->budgets()->detach();
+        }
+
         Log::debug(sprintf('RuleAction ClearBudget removed all budgets from journal %d.', $journal->id));
 
         return true;

app/TransactionRules/Actions/ClearCategory.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace FireflyIII\TransactionRules\Actions;
 
 use FireflyIII\Models\RuleAction;
+use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use Log;
 
@@ -55,6 +56,13 @@ class ClearCategory implements ActionInterface
     {
         $journal->categories()->detach();
         $journal->touch();
+
+        // also remove categories from transactions:
+        /** @var Transaction $transaction */
+        foreach($journal->transactions as $transaction) {
+            $transaction->categories()->detach();
+        }
+
         Log::debug(sprintf('RuleAction ClearCategory removed all categories from journal %d.', $journal->id));
 
         return true;

app/TransactionRules/Actions/SetBudget.php

@@ -24,6 +24,7 @@ namespace FireflyIII\TransactionRules\Actions;
 
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\RuleAction;
+use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
@@ -87,7 +88,12 @@ class SetBudget implements ActionInterface
 
         Log::debug(sprintf('RuleAction SetBudget set the budget of journal #%d to budget #%d ("%s").', $journal->id, $budget->id, $budget->name));
 
-        $journal->budgets()->sync([$budget->id]);
+        $journal->budgets()->detach();
+        // set budget on transactions:
+        /** @var Transaction $transaction */
+        foreach ($journal->transactions as $transaction) {
+            $transaction->budgets()->sync([$budget->id]);
+        }
         $journal->touch();
 
         return true;

app/TransactionRules/Actions/SetCategory.php

@@ -24,6 +24,7 @@ namespace FireflyIII\TransactionRules\Actions;
 
 use FireflyIII\Models\Category;
 use FireflyIII\Models\RuleAction;
+use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use Log;
 
@@ -56,7 +57,16 @@ class SetCategory implements ActionInterface
     {
         $name     = $this->action->action_value;
         $category = Category::firstOrCreateEncrypted(['name' => $name, 'user_id' => $journal->user->id]);
-        $journal->categories()->sync([$category->id]);
+
+        $journal->categories()->detach();
+        // set category on transactions:
+        /** @var Transaction $transaction */
+        foreach ($journal->transactions as $transaction) {
+            $transaction->categories()->sync([$category->id]);
+        }
+        $journal->touch();
+
+
         $journal->touch();
         Log::debug(sprintf('RuleAction SetCategory set the category of journal #%d to budget #%d ("%s").', $journal->id, $category->id, $category->name));
 

composer.json

@@ -118,8 +118,7 @@
 		],
 		"post-install-cmd": [
 			"php artisan optimize",
-			"php artisan firefly:instructions install",
+			"php artisan firefly:instructions install"
-			"php artisan passport:install"
 		]
 	},
 	"config": {

config/firefly.php

@@ -33,7 +33,7 @@ return [
         'is_demo_site'     => false,
     ],
     'encryption'     => (is_null(env('USE_ENCRYPTION')) || env('USE_ENCRYPTION') === true),
-    'version'        => '4.7.1',
+    'version'        => '4.7.1.3',
     'api_version'    => '0.1',
     'maxUploadSize'  => 15242880,
     'allowedMimes'   => [

readme.md

@@ -47,14 +47,15 @@ You can read more about this in the [official documentation](http://firefly-iii.
 ### Features
 Most importantly...
 
-* Firefly III runs on your own server, so you are fully in control of your data. It will not contact other sites or servers
+* Firefly III runs on your own server, so you are fully in control of your data. It will not contact other sites or servers.
-* You can import from over 2500 financial providers, in 55 countries when you enable the [Spectre API](http://firefly-iii.readthedocs.io/en/latest/import/spectre.html)
+* You can import from over 2500 financial providers, in 55 countries when you enable the [Spectre API](http://firefly-iii.readthedocs.io/en/latest/import/spectre.html).
-* You can import CSV files from practically any bank
+* You can import CSV files from practically any bank.
+* Firefly III features an JSON REST API.
 * If you feel you’re missing something you can just ask me and I’ll add it!
 
 But actually, it features:
 
-* [A double-entry bookkeeping system](https://en.wikipedia.org/wiki/Double-entry_bookkeeping_system)
+* [A double-entry bookkeeping system](http://firefly-iii.readthedocs.io/en/latest/concepts/transactions.html)
 * You can store, edit and remove [withdrawals, deposits and transfers](http://firefly-iii.readthedocs.io/en/latest/concepts/transactions.html). This allows you full financial management
 * You can manage different types of accounts
   * [Asset](http://firefly-iii.readthedocs.io/en/latest/concepts/accounts.html) accounts

resources/lang/en_US/components.php

@@ -27,4 +27,4 @@ return [
     // bills:
     'not_expected_period'    => 'Not expected this period',
     'not_or_not_yet'         => 'Not (yet)',
-];
+];

resources/lang/en_US/demo.php

@@ -21,15 +21,15 @@
 declare(strict_types=1);
 
 return [
-    'no_demo_text'                   => 'Sorry, there is no extra demo-explanation text for <abbr title=":route">this page</abbr>.',
+    'no_demo_text'           => 'Sorry, there is no extra demo-explanation text for <abbr title=":route">this page</abbr>.',
-    'see_help_icon'                  => 'However, the <i class="fa fa-question-circle"></i>-icon in the top right corner may tell you more.',
+    'see_help_icon'          => 'However, the <i class="fa fa-question-circle"></i>-icon in the top right corner may tell you more.',
-    'index'                          => 'Welcome to <strong>Firefly III</strong>! On this page you get a quick overview of your finances. For more information, check out Accounts &rarr; <a href=":asset">Asset Accounts</a> and of course the <a href=":budgets">Budgets</a> and <a href=":reports">Reports</a> pages. Or just take a look around and see where you end up.',
+    'index'                  => 'Welcome to <strong>Firefly III</strong>! On this page you get a quick overview of your finances. For more information, check out Accounts &rarr; <a href=":asset">Asset Accounts</a> and of course the <a href=":budgets">Budgets</a> and <a href=":reports">Reports</a> 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.',
+    '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.',
+    '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 a number of types of reports. Read about them by clicking on the <i class="fa fa-question-circle"></i>-icon in the top right corner.',
+    'reports-index-start'    => 'Firefly III supports a number of types of reports. Read about them by clicking on the <i class="fa fa-question-circle"></i>-icon in the top right corner.',
-    'reports-index-examples'         => 'Be sure to check out these examples: <a href=":one">a monthly financial overview</a>, <a href=":two">a yearly financial overview</a> and <a href=":three">a budget overview</a>.',
+    'reports-index-examples' => 'Be sure to check out these examples: <a href=":one">a monthly financial overview</a>, <a href=":two">a yearly financial overview</a> and <a href=":three">a budget overview</a>.',
-    '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.',
+    '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.',
+    '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.',
+    '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-index'           => 'Of course, any CSV file can be imported into Firefly III',
 ];

resources/tests/blns.base64.json

@@ -1,468 +0,0 @@
-[
-     "",
-     "dW5kZWZpbmVkCg==",
-     "dW5kZWYK",
-     "bnVsbAo=",
-     "TlVMTAo=",
-     "KG51bGwpCg==",
-     "bmlsCg==",
-     "TklMCg==",
-     "dHJ1ZQo=",
-     "ZmFsc2UK",
-     "VHJ1ZQo=",
-     "RmFsc2UK",
-     "Tm9uZQo=",
-     "aGFzT3duUHJvcGVydHkK",
-     "XFw=",
-     "MAo=",
-     "XFxcXAo=",
-     "MQo=",
-     "MS4wMAo=",
-     "JDEuMDAK",
-     "MS8yCg==",
-     "MUUyCg==",
-     "MUUwMgo=",
-     "MUUrMDIK",
-     "LTEK",
-     "LTEuMDAK",
-     "LSQxLjAwCg==",
-     "LTEvMgo=",
-     "LTFFMgo=",
-     "LTFFMDIK",
-     "LTFFKzAyCg==",
-     "MS8wCg==",
-     "MC8wCg==",
-     "LTIxNDc0ODM2NDgvLTEK",
-     "LTkyMjMzNzIwMzY4NTQ3NzU4MDgvLTEK",
-     "MC4wMAo=",
-     "MC4uMAo=",
-     "Lgo=",
-     "MC4wLjAK",
-     "MCwwMAo=",
-     "MCwsMAo=",
-     "LAo=",
-     "MCwwLDAK",
-     "MC4wLzAK",
-     "MS4wLzAuMAo=",
-     "MC4wLzAuMAo=",
-     "MSwwLzAsMAo=",
-     "MCwwLzAsMAo=",
-     "LS0xCg==",
-     "LQo=",
-     "LS4K",
-     "LSwK",
-     "OTk5OTk5OTk5OTk5OTk5OTk5OTk5OTk5OTk5OTk5OTk5OTk5OTk5OTk5OTk5OTk5OTk5OTk5OTk5OTk5OTk5OTk5OTk5OTk5OTk5OTk5OTk5OTk5OTk5OTk5OTk5OTk5Cg==",
-     "TmFOCg==",
-     "SW5maW5pdHkK",
-     "LUluZmluaXR5Cg==",
-     "MHgwCg==",
-     "MHhmZmZmZmZmZgo=",
-     "MHhmZmZmZmZmZmZmZmZmZmZmCg==",
-     "MHhhYmFkMWRlYQo=",
-     "MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5Cg==",
-     "MSwwMDAuMDAK",
-     "MSAwMDAuMDAK",
-     "MScwMDAuMDAK",
-     "MSwwMDAsMDAwLjAwCg==",
-     "MSAwMDAgMDAwLjAwCg==",
-     "MScwMDAnMDAwLjAwCg==",
-     "MS4wMDAsMDAK",
-     "MSAwMDAsMDAK",
-     "MScwMDAsMDAK",
-     "MS4wMDAuMDAwLDAwCg==",
-     "MSAwMDAgMDAwLDAwCg==",
-     "MScwMDAnMDAwLDAwCg==",
-     "MDEwMDAK",
-     "MDgK",
-     "MDkK",
-     "Mi4yMjUwNzM4NTg1MDcyMDExZS0zMDgK",
-     "LC4vOydbXS09Cg==",
-     "PD4/OiJ7fXxfKwo=",
-     "IUAjJCVeJiooKWB+Cg==",
-     "zqniiYjDp+KImuKIq8ucwrXiiaTiiaXDtwo=",
-     "w6XDn+KIgsaSwqnLmeKIhsuawqzigKbDpgo=",
-     "xZPiiJHCtMKu4oCgwqXCqMuGw7jPgOKAnOKAmAo=",
-     "wqHihKLCo8Ki4oiewqfCtuKAosKqwrrigJPiiaAK",
-     "wrjLm8OH4peKxLHLnMOCwq/LmMK/Cg==",
-     "w4XDjcOOw4/LncOTw5Tvo7/DksOaw4bimIMK",
-     "xZLigJ7CtOKAsMuHw4HCqMuGw5jiiI/igJ3igJkK",
-     "YOKBhOKCrOKAueKAuu+sge+sguKAocKwwrfigJrigJTCsQo=",
-     "4oWb4oWc4oWd4oWeCg==",
-     "0IHQgtCD0ITQhdCG0IfQiNCJ0IrQi9CM0I3QjtCP0JDQkdCS0JPQlNCV0JbQl9CY0JnQmtCb0JzQndCe0J/QoNCh0KLQo9Ck0KXQptCn0KjQqdCq0KvQrNCt0K7Qr9Cw0LHQstCz0LTQtdC20LfQuNC50LrQu9C80L3QvtC/0YDRgdGC0YPRhNGF0YbRh9GI0YnRitGL0YzRjdGO0Y8K",
-     "2aDZodmi2aPZpNml2abZp9mo2akK",
-     "4oGw4oG04oG1Cg==",
-     "4oKA4oKB4oKCCg==",
-     "4oGw4oG04oG14oKA4oKB4oKCCg==",
-     "Jwo=",
-     "Igo=",
-     "JycK",
-     "IiIK",
-     "JyInCg==",
-     "IicnJyciJyIK",
-     "IiciJyInJycnIgo=",
-     "55Sw5Lit44GV44KT44Gr44GC44GS44Gm5LiL44GV44GECg==",
-     "44OR44O844OG44Kj44O844G46KGM44GL44Gq44GE44GLCg==",
-     "5ZKM6KO95ryi6KqeCg==",
-     "6YOo6JC95qC8Cg==",
-     "7IKs7ZqM6rO87ZWZ7JuQIOyWtO2VmeyXsOq1rOyGjAo=",
-     "7LCm7LCo66W8IO2DgOqzoCDsmKgg7Y6y7Iuc66eo6rO8IOyRm+uLpOumrCDrmKDrsKnqsIHtlZgK",
-     "56S+5pyD56eR5a246Zmi6Kqe5a2456CU56m25omACg==",
-     "7Jq4656A67CU7Yag66W0Cg==",
-     "8KCcjvCgnLHwoJ258KCxk/CgsbjwoLKW8KCzjwo=",
-     "44O94Ly84LqI2YTNnOC6iOC8ve++iSDjg73gvLzguojZhM2c4LqI4Ly9776JCg==",
-     "KO+9oeKXlSDiiIAg4peV772hKQo=",
-     "772A772oKMK04oiA772A4oipCg==",
-     "X1/vvpsoLF8sKikK",
-     "44O7KO+/o+KIgO+/oynjg7s6KjoK",
-     "776f772l4py/44O+4pWyKO+9oeKXleKAv+KXle+9oSnilbHinL/vvaXvvp8K",
-     "LOOAguODuzoqOuODu+OCnOKAmSgg4pi7IM+JIOKYuyAp44CC44O7Oio644O744Kc4oCZCg==",
-     "KOKVr8Kw4pahwrDvvInila/vuLUg4pS74pSB4pS7KQo=",
-     "KO++ieCypeebiuCype+8ie++ie+7vyDilLvilIHilLsK",
-     "KCDNocKwIM2cypYgzaHCsCkK",
-     "8J+YjQo=",
-     "8J+RqfCfj70K",
-     "8J+RviDwn5mHIPCfkoEg8J+ZhSDwn5mGIPCfmYsg8J+ZjiDwn5mNCg==",
-     "8J+QtSDwn5mIIPCfmYkg8J+Zigo=",
-     "4p2k77iPIPCfkpQg8J+SjCDwn5KVIPCfkp4g8J+SkyDwn5KXIPCfkpYg8J+SmCDwn5KdIPCfkp8g8J+SnCDwn5KbIPCfkpog8J+SmQo=",
-     "4pyL8J+PvyDwn5Kq8J+PvyDwn5GQ8J+PvyDwn5mM8J+PvyDwn5GP8J+PvyDwn5mP8J+Pvwo=",
-     "8J+aviDwn4aSIPCfhpMg8J+GlSDwn4aWIPCfhpcg8J+GmSDwn4+nCg==",
-     "MO+4j+KDoyAx77iP4oOjIDLvuI/ig6MgM++4j+KDoyA077iP4oOjIDXvuI/ig6MgNu+4j+KDoyA377iP4oOjIDjvuI/ig6MgOe+4j+KDoyDwn5SfCg==",
-     "77yR77yS77yTCg==",
-     "2aHZotmjCg==",
-     "2KvZhSDZhtmB2LMg2LPZgti32Kog2YjYqNin2YTYqtit2K/Zitiv2IwsINis2LLZitix2KrZiiDYqNin2LPYqtiu2K/Yp9mFINij2YYg2K/ZhtmILiDYpdiwINmH2YbYp9ifINin2YTYs9iq2KfYsSDZiNiq2YbYtdmK2Kgg2YPYp9mGLiDYo9mH2ZHZhCDYp9mK2LfYp9mE2YrYp9iMINio2LHZiti32KfZhtmK2Kct2YHYsdmG2LPYpyDZgtivINij2K7YsC4g2LPZhNmK2YXYp9mG2Iwg2KXYqtmB2KfZgtmK2Kkg2KjZitmGINmF2KcsINmK2LDZg9ixINin2YTYrdiv2YjYryDYo9mKINio2LnYrywg2YXYudin2YXZhNipINio2YjZhNmG2K/Yp9iMINin2YTYpdi32YTYp9mCINi52YQg2KXZitmILgo=",
-     "15HWsNa816jWtdeQ16nWtNeB15nXqiwg15HWuNa816jWuNeQINeQ1rHXnNa515TWtNeZ150sINeQ1rXXqiDXlNa316nWuNa814HXnta315nWtNedLCDXldaw15DWtdeqINeU1rjXkNa416jWttelCg==",
-     "15TWuNeZ1rDXqta415R0ZXN02KfZhNi12YHYrdin2Kog2KfZhNiq2ZHYrdmI2YQK",
-     "77e9Cg==",
-     "77e6Cg==",
-     "4oCLCg==",
-     "4ZqACg==",
-     "4aCOCg==",
-     "44CACg==",
-     "77u/Cg==",
-     "4pCjCg==",
-     "4pCiCg==",
-     "4pChCg==",
-     "4oCq4oCqdGVzdOKAqgo=",
-     "4oCrdGVzdOKAqwo=",
-     "4oCpdGVzdOKAqQo=",
-     "dGVzdOKBoHRlc3TigKsK",
-     "4oGmdGVzdOKBpwo=",
-     "4bmwzLrMusyVb82eIMy3acyyzKzNh8yqzZluzJ3Ml82VdsyfzJzMmMymzZ9vzLbMmcywzKBrw6jNmsyuzLrMqsy5zLHMpCDMlnTMnc2VzLPMo8y7zKrNnmjMvM2TzLLMpsyzzJjMsmXNh8yjzLDMpsyszY4gzKLMvMy7zLHMmGjNms2OzZnMnMyjzLLNhWnMpsyyzKPMsMykdsy7zY1lzLrMrcyzzKrMsC1tzKJpzYVuzJbMusyezLLMr8ywZMy1zLzMn82ZzKnMvMyYzLMgzJ7MpcyxzLPMrXLMm8yXzJhlzZlwzaByzLzMnsy7zK3Ml2XMusygzKPNn3PMmM2HzLPNjcydzYllzYnMpcyvzJ7Mss2azKzNnMe5zKzNjs2OzJ/Mls2HzKR0zY3MrMykzZPMvMytzZjNhWnMqsyxbs2gZ8y0zYkgzY/Nic2FY8yszJ9ozaFhzKvMu8yvzZhvzKvMn8yWzY3MmcydzYlzzJfMpsyyLsyozLnNiMyjCg==",
-     "zKHNk8yezYVJzJfMmMymzZ1uzYfNh82ZdsyuzKtva8yyzKvMmc2IacyWzZnMrcy5zKDMnm7Mocy7zK7Mo8y6Z8yyzYjNmcytzZnMrM2OIMywdM2UzKZozJ7MsmXMosykIM2NzKzMss2WZsy0zJjNlcyjw6jNluG6ucylzKlszZbNlM2aac2TzZrMps2gbs2WzY3Ml82TzLPMrmfNjSDMqG/NmsyqzaFmzJjMo8ysIMyWzJjNlsyfzZnMrmPSic2UzKvNls2TzYfNls2FaMy1zKTMo82azZTDocyXzLzNlc2Fb8y8zKPMpXPMsc2IzLrMlsymzLvNoi7Mm8yWzJ7MoMyrzLAK",
-     "zJfMus2WzLnMr82T4bmuzKTNjcylzYfNiGjMssyBZc2PzZPMvMyXzJnMvMyjzZQgzYfMnMyxzKDNk82NzYVOzZXNoGXMl8yxesyYzJ3MnMy6zZlwzKTMusy5zY3Mr82aZcygzLvMoM2ccsyozKTNjcy6zJbNlMyWzJZkzKDMn8ytzKzMnc2facymzZbMqc2TzZTMpGHMoMyXzKzNicyZbs2azZwgzLvMnsywzZrNhWjMtc2JacyzzJ52zKLNh+G4mc2OzZ8t0onMrcypzLzNlG3MpMytzKtpzZXNh8ydzKZuzJfNmeG4jcyfIMyvzLLNlc2ex6vMn8yvzLDMss2ZzLvMnWYgzKrMsMywzJfMlsytzJjNmGPMps2NzLLMns2NzKnMmeG4pc2aYcyuzY7Mn8yZzZzGocypzLnNjnPMpC7MncydINKJWsyhzJbMnM2WzLDMo82JzJxhzZbMsM2ZzKzNoWzMssyrzLPNjcypZ8yhzJ/MvMyxzZrMnsyszYVvzJfNnC7Mnwo=",
-     "zKZIzKzMpMyXzKTNnWXNnCDMnMylzJ3Mu82NzJ/MgXfMlWjMlsyvzZNvzJ3NmcyWzY7MscyuINKJzLrMmcyezJ/NiFfMt8y8zK1hzLrMqs2NxK/NiM2VzK3NmcyvzJx0zLbMvMyuc8yYzZnNlsyVIMygzKvMoELMu82NzZnNicyzzYVlzLVozLXMrM2HzKvNmWnMuc2TzLPMs8yuzY7Mq8yVbs2fZMy0zKrMnMyWIMywzYnMqc2HzZnMss2ezYVUzZbMvM2TzKrNomjNj82TzK7Mu2XMrMydzJ/NhSDMpMy5zJ1XzZnMnsydzZTNh82dzYVhzY/Nk82UzLnMvMyjbMy0zZTMsMykzJ/NlOG4vcyrLs2VCg==",
-     "WsyuzJ7MoM2ZzZTNheG4gMyXzJ7NiMy7zJfhuLbNmc2OzK/MucyezZNHzLtPzK3Ml8yuCg==",
-     "y5nJkG5i4bSJbMmQIMmQdcaDyZDJryDHncm5b2xvcCDKh8edIMedyblvccmQbCDKh24gyod1bnDhtIlw4bSJyZR14bSJIMm5b2TJr8edyocgcG/Jr3Nu4bSJx50gb3AgcMedcyAnyofhtIlsx50gxoN14bSJyZRz4bSJZOG0iXDJkCDJuW7Kh8edyofJlMedc3VvyZQgJ8qHx53Jr8mQIMqH4bSJcyDJuW9sb3Agya9uc2ThtIkgya/Hncm5b8ulCg==",
-     "MDDLmcaWJC0K",
-     "77y0772I772FIO+9ke+9le+9ie+9g++9iyDvvYLvvZLvvY/vvZfvvY4g772G772P772YIO+9iu+9le+9je+9kO+9kyDvvY/vvZbvvYXvvZIg772U772I772FIO+9jO+9ge+9mu+9mSDvvYTvvY/vvYcK",
-     "8J2Qk/CdkKHwnZCeIPCdkKrwnZCu8J2QovCdkJzwnZCkIPCdkJvwnZCr8J2QqPCdkLDwnZCnIPCdkJ/wnZCo8J2QsSDwnZCj8J2QrvCdkKbwnZCp8J2QrCDwnZCo8J2Qr/CdkJ7wnZCrIPCdkK3wnZCh8J2QniDwnZCl8J2QmvCdkLPwnZCyIPCdkJ3wnZCo8J2QoAo=",
-     "8J2Vv/Cdlo3wnZaKIPCdlpbwnZaa8J2WjvCdlojwnZaQIPCdlofwnZaX8J2WlPCdlpzwnZaTIPCdlovwnZaU8J2WnSDwnZaP8J2WmvCdlpLwnZaV8J2WmCDwnZaU8J2Wm/CdlorwnZaXIPCdlpnwnZaN8J2WiiDwnZaR8J2WhvCdlp/wnZaeIPCdlonwnZaU8J2WjAo=",
-     "8J2Ru/CdkonwnZKGIPCdkpLwnZKW8J2SivCdkoTwnZKMIPCdkoPwnZKT8J2SkPCdkpjwnZKPIPCdkofwnZKQ8J2SmSDwnZKL8J2SlvCdko7wnZKR8J2SlCDwnZKQ8J2Sl/CdkobwnZKTIPCdkpXwnZKJ8J2ShiDwnZKN8J2SgvCdkpvwnZKaIPCdkoXwnZKQ8J2SiAo=",
-     "8J2To/Cdk7HwnZOuIPCdk7rwnZO+8J2TsvCdk6zwnZO0IPCdk6vwnZO78J2TuPCdlIDwnZO3IPCdk6/wnZO48J2UgSDwnZOz8J2TvvCdk7bwnZO58J2TvCDwnZO48J2Tv/Cdk67wnZO7IPCdk73wnZOx8J2TriDwnZO18J2TqvCdlIPwnZSCIPCdk63wnZO48J2TsAo=",
-     "8J2Vi/CdlZnwnZWWIPCdlaLwnZWm8J2VmvCdlZTwnZWcIPCdlZPwnZWj8J2VoPCdlajwnZWfIPCdlZfwnZWg8J2VqSDwnZWb8J2VpvCdlZ7wnZWh8J2VpCDwnZWg8J2Vp/CdlZbwnZWjIPCdlaXwnZWZ8J2VliDwnZWd8J2VkvCdlavwnZWqIPCdlZXwnZWg8J2VmAo=",
-     "8J2ag/CdmpHwnZqOIPCdmprwnZqe8J2akvCdmozwnZqUIPCdmovwnZqb8J2amPCdmqDwnZqXIPCdmo/wnZqY8J2aoSDwnZqT8J2anvCdmpbwnZqZ8J2anCDwnZqY8J2an/Cdmo7wnZqbIPCdmp3wnZqR8J2ajiDwnZqV8J2aivCdmqPwnZqiIPCdmo3wnZqY8J2akAo=",
-     "4pKv4pKj4pKgIOKSrOKSsOKSpOKSnuKSpiDikp3ikq3ikqrikrLikqkg4pKh4pKq4pKzIOKSpeKSsOKSqOKSq+KSriDikqrikrHikqDikq0g4pKv4pKj4pKgIOKSp+KSnOKSteKStCDikp/ikqrikqIK",
-     "PHNjcmlwdD5hbGVydCgxMjMpPC9zY3JpcHQ+Cg==",
-     "Jmx0O3NjcmlwdCZndDthbGVydCgmIzM5OzEyMyYjMzk7KTsmbHQ7L3NjcmlwdCZndDsK",
-     "PGltZyBzcmM9eCBvbmVycm9yPWFsZXJ0KDEyMykgLz4K",
-     "PHN2Zz48c2NyaXB0PjEyMzwxPmFsZXJ0KDEyMyk8L3NjcmlwdD4K",
-     "Ij48c2NyaXB0PmFsZXJ0KDEyMyk8L3NjcmlwdD4K",
-     "Jz48c2NyaXB0PmFsZXJ0KDEyMyk8L3NjcmlwdD4K",
-     "PjxzY3JpcHQ+YWxlcnQoMTIzKTwvc2NyaXB0Pgo=",
-     "PC9zY3JpcHQ+PHNjcmlwdD5hbGVydCgxMjMpPC9zY3JpcHQ+Cg==",
-     "PCAvIHNjcmlwdCA+PCBzY3JpcHQgPmFsZXJ0KDEyMyk8IC8gc2NyaXB0ID4K",
-     "b25mb2N1cz1KYVZhU0NyaXB0OmFsZXJ0KDEyMykgYXV0b2ZvY3VzCg==",
-     "IiBvbmZvY3VzPUphVmFTQ3JpcHQ6YWxlcnQoMTIzKSBhdXRvZm9jdXMK",
-     "JyBvbmZvY3VzPUphVmFTQ3JpcHQ6YWxlcnQoMTIzKSBhdXRvZm9jdXMK",
-     "77ycc2NyaXB077yeYWxlcnQoMTIzKe+8nC9zY3JpcHTvvJ4K",
-     "PHNjPHNjcmlwdD5yaXB0PmFsZXJ0KDEyMyk8L3NjPC9zY3JpcHQ+cmlwdD4K",
-     "LS0+PHNjcmlwdD5hbGVydCgxMjMpPC9zY3JpcHQ+Cg==",
-     "IjthbGVydCgxMjMpO3Q9Igo=",
-     "JzthbGVydCgxMjMpO3Q9Jwo=",
-     "SmF2YVNDcmlwdDphbGVydCgxMjMpCg==",
-     "O2FsZXJ0KDEyMyk7Cg==",
-     "c3JjPUphVmFTQ3JpcHQ6cHJvbXB0KDEzMikK",
-     "Ij48c2NyaXB0PmFsZXJ0KDEyMyk7PC9zY3JpcHQgeD0iCg==",
-     "Jz48c2NyaXB0PmFsZXJ0KDEyMyk7PC9zY3JpcHQgeD0nCg==",
-     "PjxzY3JpcHQ+YWxlcnQoMTIzKTs8L3NjcmlwdCB4PQo=",
-     "IiBhdXRvZm9jdXMgb25rZXl1cD0iamF2YXNjcmlwdDphbGVydCgxMjMpCg==",
-     "JyBhdXRvZm9jdXMgb25rZXl1cD0namF2YXNjcmlwdDphbGVydCgxMjMpCg==",
-     "PHNjcmlwdHgyMHR5cGU9InRleHQvamF2YXNjcmlwdCI+amF2YXNjcmlwdDphbGVydCgxKTs8L3NjcmlwdD4K",
-     "PHNjcmlwdHgzRXR5cGU9InRleHQvamF2YXNjcmlwdCI+amF2YXNjcmlwdDphbGVydCgxKTs8L3NjcmlwdD4K",
-     "PHNjcmlwdHgwRHR5cGU9InRleHQvamF2YXNjcmlwdCI+amF2YXNjcmlwdDphbGVydCgxKTs8L3NjcmlwdD4K",
-     "PHNjcmlwdHgwOXR5cGU9InRleHQvamF2YXNjcmlwdCI+amF2YXNjcmlwdDphbGVydCgxKTs8L3NjcmlwdD4K",
-     "PHNjcmlwdHgwQ3R5cGU9InRleHQvamF2YXNjcmlwdCI+amF2YXNjcmlwdDphbGVydCgxKTs8L3NjcmlwdD4K",
-     "PHNjcmlwdHgyRnR5cGU9InRleHQvamF2YXNjcmlwdCI+amF2YXNjcmlwdDphbGVydCgxKTs8L3NjcmlwdD4K",
-     "PHNjcmlwdHgwQXR5cGU9InRleHQvamF2YXNjcmlwdCI+amF2YXNjcmlwdDphbGVydCgxKTs8L3NjcmlwdD4K",
-     "J2AiPjx4M0NzY3JpcHQ+amF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "J2AiPjx4MDBzY3JpcHQ+amF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "QUJDPGRpdiBzdHlsZT0ieHgzQWV4cHJlc3Npb24oamF2YXNjcmlwdDphbGVydCgxKSI+REVGCg==",
-     "QUJDPGRpdiBzdHlsZT0ieDpleHByZXNzaW9ueDVDKGphdmFzY3JpcHQ6YWxlcnQoMSkiPkRFRgo=",
-     "QUJDPGRpdiBzdHlsZT0ieDpleHByZXNzaW9ueDAwKGphdmFzY3JpcHQ6YWxlcnQoMSkiPkRFRgo=",
-     "QUJDPGRpdiBzdHlsZT0ieDpleHB4MDByZXNzaW9uKGphdmFzY3JpcHQ6YWxlcnQoMSkiPkRFRgo=",
-     "QUJDPGRpdiBzdHlsZT0ieDpleHB4NUNyZXNzaW9uKGphdmFzY3JpcHQ6YWxlcnQoMSkiPkRFRgo=",
-     "QUJDPGRpdiBzdHlsZT0ieDp4MEFleHByZXNzaW9uKGphdmFzY3JpcHQ6YWxlcnQoMSkiPkRFRgo=",
-     "QUJDPGRpdiBzdHlsZT0ieDp4MDlleHByZXNzaW9uKGphdmFzY3JpcHQ6YWxlcnQoMSkiPkRFRgo=",
-     "QUJDPGRpdiBzdHlsZT0ieDp4RTN4ODB4ODBleHByZXNzaW9uKGphdmFzY3JpcHQ6YWxlcnQoMSkiPkRFRgo=",
-     "QUJDPGRpdiBzdHlsZT0ieDp4RTJ4ODB4ODRleHByZXNzaW9uKGphdmFzY3JpcHQ6YWxlcnQoMSkiPkRFRgo=",
-     "QUJDPGRpdiBzdHlsZT0ieDp4QzJ4QTBleHByZXNzaW9uKGphdmFzY3JpcHQ6YWxlcnQoMSkiPkRFRgo=",
-     "QUJDPGRpdiBzdHlsZT0ieDp4RTJ4ODB4ODBleHByZXNzaW9uKGphdmFzY3JpcHQ6YWxlcnQoMSkiPkRFRgo=",
-     "QUJDPGRpdiBzdHlsZT0ieDp4RTJ4ODB4OEFleHByZXNzaW9uKGphdmFzY3JpcHQ6YWxlcnQoMSkiPkRFRgo=",
-     "QUJDPGRpdiBzdHlsZT0ieDp4MERleHByZXNzaW9uKGphdmFzY3JpcHQ6YWxlcnQoMSkiPkRFRgo=",
-     "QUJDPGRpdiBzdHlsZT0ieDp4MENleHByZXNzaW9uKGphdmFzY3JpcHQ6YWxlcnQoMSkiPkRFRgo=",
-     "QUJDPGRpdiBzdHlsZT0ieDp4RTJ4ODB4ODdleHByZXNzaW9uKGphdmFzY3JpcHQ6YWxlcnQoMSkiPkRFRgo=",
-     "QUJDPGRpdiBzdHlsZT0ieDp4RUZ4QkJ4QkZleHByZXNzaW9uKGphdmFzY3JpcHQ6YWxlcnQoMSkiPkRFRgo=",
-     "QUJDPGRpdiBzdHlsZT0ieDp4MjBleHByZXNzaW9uKGphdmFzY3JpcHQ6YWxlcnQoMSkiPkRFRgo=",
-     "QUJDPGRpdiBzdHlsZT0ieDp4RTJ4ODB4ODhleHByZXNzaW9uKGphdmFzY3JpcHQ6YWxlcnQoMSkiPkRFRgo=",
-     "QUJDPGRpdiBzdHlsZT0ieDp4MDBleHByZXNzaW9uKGphdmFzY3JpcHQ6YWxlcnQoMSkiPkRFRgo=",
-     "QUJDPGRpdiBzdHlsZT0ieDp4RTJ4ODB4OEJleHByZXNzaW9uKGphdmFzY3JpcHQ6YWxlcnQoMSkiPkRFRgo=",
-     "QUJDPGRpdiBzdHlsZT0ieDp4RTJ4ODB4ODZleHByZXNzaW9uKGphdmFzY3JpcHQ6YWxlcnQoMSkiPkRFRgo=",
-     "QUJDPGRpdiBzdHlsZT0ieDp4RTJ4ODB4ODVleHByZXNzaW9uKGphdmFzY3JpcHQ6YWxlcnQoMSkiPkRFRgo=",
-     "QUJDPGRpdiBzdHlsZT0ieDp4RTJ4ODB4ODJleHByZXNzaW9uKGphdmFzY3JpcHQ6YWxlcnQoMSkiPkRFRgo=",
-     "QUJDPGRpdiBzdHlsZT0ieDp4MEJleHByZXNzaW9uKGphdmFzY3JpcHQ6YWxlcnQoMSkiPkRFRgo=",
-     "QUJDPGRpdiBzdHlsZT0ieDp4RTJ4ODB4ODFleHByZXNzaW9uKGphdmFzY3JpcHQ6YWxlcnQoMSkiPkRFRgo=",
-     "QUJDPGRpdiBzdHlsZT0ieDp4RTJ4ODB4ODNleHByZXNzaW9uKGphdmFzY3JpcHQ6YWxlcnQoMSkiPkRFRgo=",
-     "QUJDPGRpdiBzdHlsZT0ieDp4RTJ4ODB4ODlleHByZXNzaW9uKGphdmFzY3JpcHQ6YWxlcnQoMSkiPkRFRgo=",
-     "PGEgaHJlZj0ieDBCamF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieDBGamF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieEMyeEEwamF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieDA1amF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieEUxeEEweDhFamF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieDE4amF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieDExamF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieEUyeDgweDg4amF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieEUyeDgweDg5amF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieEUyeDgweDgwamF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieDE3amF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieDAzamF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieDBFamF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieDFBamF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieDAwamF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieDEwamF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieEUyeDgweDgyamF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieDIwamF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieDEzamF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieDA5amF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieEUyeDgweDhBamF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieDE0amF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieDE5amF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieEUyeDgweEFGamF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieDFGamF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieEUyeDgweDgxamF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieDFEamF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieEUyeDgweDg3amF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieDA3amF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieEUxeDlBeDgwamF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieEUyeDgweDgzamF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieDA0amF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieDAxamF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieDA4amF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieEUyeDgweDg0amF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieEUyeDgweDg2amF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieEUzeDgweDgwamF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieDEyamF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieDBEamF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieDBBamF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieDBDamF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieDE1amF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieEUyeDgweEE4amF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieDE2amF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieDAyamF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieDFCamF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieDA2amF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieEUyeDgweEE5amF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieEUyeDgweDg1amF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieDFFamF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieEUyeDgxeDlGamF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0ieDFDamF2YXNjcmlwdDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0iamF2YXNjcmlwdHgwMDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0iamF2YXNjcmlwdHgzQTpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0iamF2YXNjcmlwdHgwOTpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0iamF2YXNjcmlwdHgwRDpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "PGEgaHJlZj0iamF2YXNjcmlwdHgwQTpqYXZhc2NyaXB0OmFsZXJ0KDEpIiBpZD0iZnV6emVsZW1lbnQxIj50ZXN0PC9hPgo=",
-     "YCInPjxpbWcgc3JjPXh4eDp4IHgwQW9uZXJyb3I9amF2YXNjcmlwdDphbGVydCgxKT4K",
-     "YCInPjxpbWcgc3JjPXh4eDp4IHgyMm9uZXJyb3I9amF2YXNjcmlwdDphbGVydCgxKT4K",
-     "YCInPjxpbWcgc3JjPXh4eDp4IHgwQm9uZXJyb3I9amF2YXNjcmlwdDphbGVydCgxKT4K",
-     "YCInPjxpbWcgc3JjPXh4eDp4IHgwRG9uZXJyb3I9amF2YXNjcmlwdDphbGVydCgxKT4K",
-     "YCInPjxpbWcgc3JjPXh4eDp4IHgyRm9uZXJyb3I9amF2YXNjcmlwdDphbGVydCgxKT4K",
-     "YCInPjxpbWcgc3JjPXh4eDp4IHgwOW9uZXJyb3I9amF2YXNjcmlwdDphbGVydCgxKT4K",
-     "YCInPjxpbWcgc3JjPXh4eDp4IHgwQ29uZXJyb3I9amF2YXNjcmlwdDphbGVydCgxKT4K",
-     "YCInPjxpbWcgc3JjPXh4eDp4IHgwMG9uZXJyb3I9amF2YXNjcmlwdDphbGVydCgxKT4K",
-     "YCInPjxpbWcgc3JjPXh4eDp4IHgyN29uZXJyb3I9amF2YXNjcmlwdDphbGVydCgxKT4K",
-     "YCInPjxpbWcgc3JjPXh4eDp4IHgyMG9uZXJyb3I9amF2YXNjcmlwdDphbGVydCgxKT4K",
-     "ImAnPjxzY3JpcHQ+eDNCamF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+eDBEamF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+eEVGeEJCeEJGamF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+eEUyeDgweDgxamF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+eEUyeDgweDg0amF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+eEUzeDgweDgwamF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+eDA5amF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+eEUyeDgweDg5amF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+eEUyeDgweDg1amF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+eEUyeDgweDg4amF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+eDAwamF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+eEUyeDgweEE4amF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+eEUyeDgweDhBamF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+eEUxeDlBeDgwamF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+eDBDamF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+eDJCamF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+eEYweDkweDk2eDlBamF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+LWphdmFzY3JpcHQ6YWxlcnQoMSk8L3NjcmlwdD4K",
-     "ImAnPjxzY3JpcHQ+eDBBamF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+eEUyeDgweEFGamF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+eDdFamF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+eEUyeDgweDg3amF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+eEUyeDgxeDlGamF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+eEUyeDgweEE5amF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+eEMyeDg1amF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+eEVGeEJGeEFFamF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+eEUyeDgweDgzamF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+eEUyeDgweDhCamF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+eEVGeEJGeEJFamF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+eEUyeDgweDgwamF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+eDIxamF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+eEUyeDgweDgyamF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+eEUyeDgweDg2amF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+eEUxeEEweDhFamF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+eDBCamF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+eDIwamF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "ImAnPjxzY3JpcHQ+eEMyeEEwamF2YXNjcmlwdDphbGVydCgxKTwvc2NyaXB0Pgo=",
-     "PGltZyB4MDBzcmM9eCBvbmVycm9yPSJhbGVydCgxKSI+Cg==",
-     "PGltZyB4NDdzcmM9eCBvbmVycm9yPSJqYXZhc2NyaXB0OmFsZXJ0KDEpIj4K",
-     "PGltZyB4MTFzcmM9eCBvbmVycm9yPSJqYXZhc2NyaXB0OmFsZXJ0KDEpIj4K",
-     "PGltZyB4MTJzcmM9eCBvbmVycm9yPSJqYXZhc2NyaXB0OmFsZXJ0KDEpIj4K",
-     "PGltZ3g0N3NyYz14IG9uZXJyb3I9ImphdmFzY3JpcHQ6YWxlcnQoMSkiPgo=",
-     "PGltZ3gxMHNyYz14IG9uZXJyb3I9ImphdmFzY3JpcHQ6YWxlcnQoMSkiPgo=",
-     "PGltZ3gxM3NyYz14IG9uZXJyb3I9ImphdmFzY3JpcHQ6YWxlcnQoMSkiPgo=",
-     "PGltZ3gzMnNyYz14IG9uZXJyb3I9ImphdmFzY3JpcHQ6YWxlcnQoMSkiPgo=",
-     "PGltZ3g0N3NyYz14IG9uZXJyb3I9ImphdmFzY3JpcHQ6YWxlcnQoMSkiPgo=",
-     "PGltZ3gxMXNyYz14IG9uZXJyb3I9ImphdmFzY3JpcHQ6YWxlcnQoMSkiPgo=",
-     "PGltZyB4NDdzcmM9eCBvbmVycm9yPSJqYXZhc2NyaXB0OmFsZXJ0KDEpIj4K",
-     "PGltZyB4MzRzcmM9eCBvbmVycm9yPSJqYXZhc2NyaXB0OmFsZXJ0KDEpIj4K",
-     "PGltZyB4MzlzcmM9eCBvbmVycm9yPSJqYXZhc2NyaXB0OmFsZXJ0KDEpIj4K",
-     "PGltZyB4MDBzcmM9eCBvbmVycm9yPSJqYXZhc2NyaXB0OmFsZXJ0KDEpIj4K",
-     "PGltZyBzcmN4MDk9eCBvbmVycm9yPSJqYXZhc2NyaXB0OmFsZXJ0KDEpIj4K",
-     "PGltZyBzcmN4MTA9eCBvbmVycm9yPSJqYXZhc2NyaXB0OmFsZXJ0KDEpIj4K",
-     "PGltZyBzcmN4MTM9eCBvbmVycm9yPSJqYXZhc2NyaXB0OmFsZXJ0KDEpIj4K",
-     "PGltZyBzcmN4MzI9eCBvbmVycm9yPSJqYXZhc2NyaXB0OmFsZXJ0KDEpIj4K",
-     "PGltZyBzcmN4MTI9eCBvbmVycm9yPSJqYXZhc2NyaXB0OmFsZXJ0KDEpIj4K",
-     "PGltZyBzcmN4MTE9eCBvbmVycm9yPSJqYXZhc2NyaXB0OmFsZXJ0KDEpIj4K",
-     "PGltZyBzcmN4MDA9eCBvbmVycm9yPSJqYXZhc2NyaXB0OmFsZXJ0KDEpIj4K",
-     "PGltZyBzcmN4NDc9eCBvbmVycm9yPSJqYXZhc2NyaXB0OmFsZXJ0KDEpIj4K",
-     "PGltZyBzcmM9eHgwOW9uZXJyb3I9ImphdmFzY3JpcHQ6YWxlcnQoMSkiPgo=",
-     "PGltZyBzcmM9eHgxMG9uZXJyb3I9ImphdmFzY3JpcHQ6YWxlcnQoMSkiPgo=",
-     "PGltZyBzcmM9eHgxMW9uZXJyb3I9ImphdmFzY3JpcHQ6YWxlcnQoMSkiPgo=",
-     "PGltZyBzcmM9eHgxMm9uZXJyb3I9ImphdmFzY3JpcHQ6YWxlcnQoMSkiPgo=",
-     "PGltZyBzcmM9eHgxM29uZXJyb3I9ImphdmFzY3JpcHQ6YWxlcnQoMSkiPgo=",
-     "PGltZ1thXVtiXVtjXXNyY1tkXT14W2Vdb25lcnJvcj1bZl0iYWxlcnQoMSkiPgo=",
-     "PGltZyBzcmM9eCBvbmVycm9yPXgwOSJqYXZhc2NyaXB0OmFsZXJ0KDEpIj4K",
-     "PGltZyBzcmM9eCBvbmVycm9yPXgxMCJqYXZhc2NyaXB0OmFsZXJ0KDEpIj4K",
-     "PGltZyBzcmM9eCBvbmVycm9yPXgxMSJqYXZhc2NyaXB0OmFsZXJ0KDEpIj4K",
-     "PGltZyBzcmM9eCBvbmVycm9yPXgxMiJqYXZhc2NyaXB0OmFsZXJ0KDEpIj4K",
-     "PGltZyBzcmM9eCBvbmVycm9yPXgzMiJqYXZhc2NyaXB0OmFsZXJ0KDEpIj4K",
-     "PGltZyBzcmM9eCBvbmVycm9yPXgwMCJqYXZhc2NyaXB0OmFsZXJ0KDEpIj4K",
-     "PGEgaHJlZj1qYXZhJiMxJiMyJiMzJiM0JiM1JiM2JiM3JiM4JiMxMSYjMTJzY3JpcHQ6amF2YXNjcmlwdDphbGVydCgxKT5YWFg8L2E+Cg==",
-     "PGltZyBzcmM9InhgIGA8c2NyaXB0PmphdmFzY3JpcHQ6YWxlcnQoMSk8L3NjcmlwdD4iYCBgPgo=",
-     "PGltZyBzcmMgb25lcnJvciAvIiAnIj0gYWx0PWphdmFzY3JpcHQ6YWxlcnQoMSkvLyI+Cg==",
-     "PHRpdGxlIG9ucHJvcGVydHljaGFuZ2U9amF2YXNjcmlwdDphbGVydCgxKT48L3RpdGxlPjx0aXRsZSB0aXRsZT0+Cg==",
-     "PGEgaHJlZj1odHRwOi8vZm9vLmJhci8jeD1geT48L2E+PGltZyBhbHQ9ImA+PGltZyBzcmM9eDp4IG9uZXJyb3I9amF2YXNjcmlwdDphbGVydCgxKT48L2E+Ij4K",
-     "PCEtLVtpZl0+PHNjcmlwdD5qYXZhc2NyaXB0OmFsZXJ0KDEpPC9zY3JpcHQgLS0+Cg==",
-     "PCEtLVtpZjxpbWcgc3JjPXggb25lcnJvcj1qYXZhc2NyaXB0OmFsZXJ0KDEpLy9dPiAtLT4K",
-     "PHNjcmlwdCBzcmM9Ii8lKGpzY3JpcHQpcyI+PC9zY3JpcHQ+Cg==",
-     "PHNjcmlwdCBzcmM9IlwlKGpzY3JpcHQpcyI+PC9zY3JpcHQ+Cg==",
-     "PElNRyAiIiI+PFNDUklQVD5hbGVydCgiWFNTIik8L1NDUklQVD4iPgo=",
-     "PElNRyBTUkM9amF2YXNjcmlwdDphbGVydChTdHJpbmcuZnJvbUNoYXJDb2RlKDg4LDgzLDgzKSk+Cg==",
-     "PElNRyBTUkM9IyBvbm1vdXNlb3Zlcj0iYWxlcnQoJ3h4cycpIj4K",
-     "PElNRyBTUkM9IG9ubW91c2VvdmVyPSJhbGVydCgneHhzJykiPgo=",
-     "PElNRyBvbm1vdXNlb3Zlcj0iYWxlcnQoJ3h4cycpIj4K",
-     "PElNRyBTUkM9JiMxMDY7JiM5NzsmIzExODsmIzk3OyYjMTE1OyYjOTk7JiMxMTQ7JiMxMDU7JiMxMTI7JiMxMTY7JiM1ODsmIzk3OyYjMTA4OyYjMTAxOyYjMTE0OyYjMTE2OyYjNDA7JiMzOTsmIzg4OyYjODM7JiM4MzsmIzM5OyYjNDE7Pgo=",
-     "PElNRyBTUkM9JiMwMDAwMTA2JiMwMDAwMDk3JiMwMDAwMTE4JiMwMDAwMDk3JiMwMDAwMTE1JiMwMDAwMDk5JiMwMDAwMTE0JiMwMDAwMTA1JiMwMDAwMTEyJiMwMDAwMTE2JiMwMDAwMDU4JiMwMDAwMDk3JiMwMDAwMTA4JiMwMDAwMTAxJiMwMDAwMTE0JiMwMDAwMTE2JiMwMDAwMDQwJiMwMDAwMDM5JiMwMDAwMDg4JiMwMDAwMDgzJiMwMDAwMDgzJiMwMDAwMDM5JiMwMDAwMDQxPgo=",
-     "PElNRyBTUkM9JiN4NkEmI3g2MSYjeDc2JiN4NjEmI3g3MyYjeDYzJiN4NzImI3g2OSYjeDcwJiN4NzQmI3gzQSYjeDYxJiN4NkMmI3g2NSYjeDcyJiN4NzQmI3gyOCYjeDI3JiN4NTgmI3g1MyYjeDUzJiN4MjcmI3gyOT4K",
-     "PElNRyBTUkM9ImphdiBhc2NyaXB0OmFsZXJ0KCdYU1MnKTsiPgo=",
-     "PElNRyBTUkM9ImphdiYjeDA5O2FzY3JpcHQ6YWxlcnQoJ1hTUycpOyI+Cg==",
-     "PElNRyBTUkM9ImphdiYjeDBBO2FzY3JpcHQ6YWxlcnQoJ1hTUycpOyI+Cg==",
-     "PElNRyBTUkM9ImphdiYjeDBEO2FzY3JpcHQ6YWxlcnQoJ1hTUycpOyI+Cg==",
-     "cGVybCAtZSAncHJpbnQgIjxJTUcgU1JDPWphdmEwc2NyaXB0OmFsZXJ0KCJYU1MiKT4iOycgPiBvdXQK",
-     "PElNRyBTUkM9IiAmIzE0OyBqYXZhc2NyaXB0OmFsZXJ0KCdYU1MnKTsiPgo=",
-     "PFNDUklQVC9YU1MgU1JDPSJodHRwOi8vaGEuY2tlcnMub3JnL3hzcy5qcyI+PC9TQ1JJUFQ+Cg==",
-     "PEJPRFkgb25sb2FkISMkJSYoKSp+Ky1fLiw6Oz9AWy98XV5gPWFsZXJ0KCJYU1MiKT4K",
-     "PFNDUklQVC9TUkM9Imh0dHA6Ly9oYS5ja2Vycy5vcmcveHNzLmpzIj48L1NDUklQVD4K",
-     "PDxTQ1JJUFQ+YWxlcnQoIlhTUyIpOy8vPDwvU0NSSVBUPgo=",
-     "PFNDUklQVCBTUkM9aHR0cDovL2hhLmNrZXJzLm9yZy94c3MuanM/PCBCID4K",
-     "PFNDUklQVCBTUkM9Ly9oYS5ja2Vycy5vcmcvLmo+Cg==",
-     "PElNRyBTUkM9ImphdmFzY3JpcHQ6YWxlcnQoJ1hTUycpIgo=",
-     "PGlmcmFtZSBzcmM9aHR0cDovL2hhLmNrZXJzLm9yZy9zY3JpcHRsZXQuaHRtbCA8Cg==",
-     "IjthbGVydCgnWFNTJyk7Ly8K",
-     "PHBsYWludGV4dD4K",
-     "PC90ZXh0YXJlYT48c2NyaXB0PmFsZXJ0KDEyMyk8L3NjcmlwdD4=",
-     "MTtEUk9QIFRBQkxFIHVzZXJzCg==",
-     "MSc7IERST1AgVEFCTEUgdXNlcnMtLSAxCg==",
-     "JyBPUiAxPTEgLS0gMQo=",
-     "JyBPUiAnMSc9JzEK",
-     "LQo=",
-     "LS0K",
-     "LS12ZXJzaW9uCg==",
-     "LS1oZWxwCg==",
-     "JFVTRVIK",
-     "L2Rldi9udWxsOyB0b3VjaCAvdG1wL2JsbnMuZmFpbCA7IGVjaG8K",
-     "YHRvdWNoIC90bXAvYmxucy5mYWlsYAo=",
-     "JCh0b3VjaCAvdG1wL2JsbnMuZmFpbCkK",
-     "QHtbc3lzdGVtICJ0b3VjaCAvdG1wL2JsbnMuZmFpbCJdfQo=",
-     "ZXZhbCgicHV0cyAnaGVsbG8gd29ybGQnIikK",
-     "U3lzdGVtKCJscyAtYWwgLyIpCg==",
-     "YGxzIC1hbCAvYAo=",
-     "S2VybmVsLmV4ZWMoImxzIC1hbCAvIikK",
-     "S2VybmVsLmV4aXQoMSkK",
-     "JXgoJ2xzIC1hbCAvJykK",
-     "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iSVNPLTg4NTktMSI/PjwhRE9DVFlQRSBmb28gWyA8IUVMRU1FTlQgZm9vIEFOWSA+PCFFTlRJVFkgeHhlIFNZU1RFTSAiZmlsZTovLy9ldGMvcGFzc3dkIiA+XT48Zm9vPiZ4eGU7PC9mb28+Cg==",
-     "JEhPTUUK",
-     "JEVOVnsnSE9NRSd9Cg==",
-     "JWQK",
-     "JXMK",
-     "ezB9",
-     "JSouKnMK",
-     "Li4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vZXRjL3Bhc3N3ZCUwMAo=",
-     "Li4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vZXRjL2hvc3RzCg==",
-     "KCkgeyAwOyB9OyB0b3VjaCAvdG1wL2JsbnMuc2hlbGxzaG9jazEuZmFpbDsK",
-     "KCkgeyBfOyB9ID5fWyQoJCgpKV0geyB0b3VjaCAvdG1wL2JsbnMuc2hlbGxzaG9jazIuZmFpbDsgfQo=",
-     "KysrQVRIMA==",
-     "Q09OCg==",
-     "UFJOCg==",
-     "QVVYCg==",
-     "Q0xPQ0skCg==",
-     "TlVMCg==",
-     "QToK",
-     "Wlo6Cg==",
-     "Q09NMQo=",
-     "TFBUMQo=",
-     "TFBUMgo=",
-     "TFBUMwo=",
-     "Q09NMgo=",
-     "Q09NMwo=",
-     "Q09NNAo=",
-     "U2N1bnRob3JwZSBHZW5lcmFsIEhvc3BpdGFsCg==",
-     "UGVuaXN0b25lIENvbW11bml0eSBDaHVyY2gK",
-     "TGlnaHR3YXRlciBDb3VudHJ5IFBhcmsK",
-     "SmltbXkgQ2xpdGhlcm9lCg==",
-     "SG9ybmltYW4gTXVzZXVtCg==",
-     "c2hpdGFrZSBtdXNocm9vbXMK",
-     "Um9tYW5zSW5TdXNzZXguY28udWsK",
-     "aHR0cDovL3d3dy5jdW0ucWMuY2EvCg==",
-     "Q3JhaWcgQ29ja2J1cm4sIFNvZnR3YXJlIFNwZWNpYWxpc3QK",
-     "TGluZGEgQ2FsbGFoYW4K",
-     "RHIuIEhlcm1hbiBJLiBMaWJzaGl0ego=",
-     "bWFnbmEgY3VtIGxhdWRlCg==",
-     "U3VwZXIgQm93bCBYWFgK",
-     "bWVkaWV2YWwgZXJlY3Rpb24gb2YgcGFyYXBldHMK",
-     "ZXZhbHVhdGUK",
-     "bW9jaGEK",
-     "ZXhwcmVzc2lvbgo=",
-     "QXJzZW5hbCBjYW5hbAo=",
-     "Y2xhc3NpYwo=",
-     "VHlzb24gR2F5Cg==",
-     "SWYgeW91J3JlIHJlYWRpbmcgdGhpcywgeW91J3ZlIGJlZW4gaW4gYSBjb21hIGZvciBhbG1vc3QgMjAgeWVhcnMgbm93LiBXZSdyZSB0cnlpbmcgYSBuZXcgdGVjaG5pcXVlLiBXZSBkb24ndCBrbm93IHdoZXJlIHRoaXMgbWVzc2FnZSB3aWxsIGVuZCB1cCBpbiB5b3VyIGRyZWFtLCBidXQgd2UgaG9wZSBpdCB3b3Jrcy4gUGxlYXNlIHdha2UgdXAsIHdlIG1pc3MgeW91Lgo=",
-     "Um9zZXMgYXJlIBtbMDszMW1yZWQbWzBtLCB2aW9sZXRzIGFyZSAbWzA7MzRtYmx1ZS4gSG9wZSB5b3UgZW5qb3kgdGVybWluYWwgaHVlCg==",
-     "QnV0IG5vdy4uLhtbMjBDZm9yIG15IGdyZWF0ZXN0IHRyaWNrLi4uG1s4bQo=",
-     "VGhlIHF1aWMICAgICAhrIGJyb3duIGZvBwcHBwcHBwcHBwd4Li4uIFtCZWVlZXBdCg==",
-     "UG93ZXLZhNmP2YTZj9i12ZHYqNmP2YTZj9mE2LXZkdio2Y/Ysdix2Ysg4KWjIOClo2gg4KWjIOClo+WGlwo="
- ]

resources/views/layout/default.twig

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="{{ trans('config.html_language') }}">
 <head>
+    <base href="{{ route('index') }}/">
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="csrf-token" content="{{ csrf_token() }}">
@@ -16,7 +17,6 @@
         Firefly III
 
     </title>
-    <base href="{{ route('index') }}/">
     <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
     <link href="css/app.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
     <link href="lib/adminlte/css/AdminLTE.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>

resources/views/layout/empty.twig

@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html lang="{{ trans('config.html_language') }}">
 <head>
+    <base href="{{ route('index') }}/">
     <meta charset="UTF-8">
     <meta name="robots" content="noindex, nofollow, noarchive, noodp, NoImageIndex, noydir">
     <title>Firefly III</title>
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
-    <base href="{{ route('index') }}/">
     <link href="css/app.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
     <link href="lib/adminlte/css/AdminLTE.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
 

resources/views/layout/guest.twig

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="{{ trans('config.html_language') }}">
 <head>
+    <base href="{{ route('index') }}/">
     <meta charset="UTF-8">
     <meta name="robots" content="noindex, nofollow, noarchive, noodp, NoImageIndex, noydir">
     <title>Firefly III
@@ -15,7 +16,6 @@
     </title>
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
-    <base href="{{ route('index') }}/">
     <link href="css/app.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
     <link href="lib/adminlte/css/AdminLTE.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
     <link href="css/firefly.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>

tests/Api/V1/Controllers/AboutControllerTest.php

@@ -77,4 +77,4 @@ class AboutControllerTest extends TestCase
     }
 
 
-}
+}

tests/Api/V1/Controllers/AccountControllerTest.php

@@ -451,4 +451,4 @@ class AccountControllerTest extends TestCase
     }
 
 
-}
+}

tests/Api/V1/Controllers/BillControllerTest.php

@@ -242,4 +242,4 @@ class BillControllerTest extends TestCase
         $response->assertSee($bill->name);
     }
 
-}
+}

tests/Api/V1/Controllers/TransactionControllerTest.php

@@ -1362,16 +1362,12 @@ class TransactionControllerTest extends TestCase
         $response->assertStatus(200);
         $response->assertJson(
             [
-                'data' => [
+                'data' => [[
-                    'attributes' => [
+                               'attributes' => [
-                        'description' => $journal->description,
+                                   'description' => $journal->description,
-                        'type'        => 'Deposit',
+                                   'type'        => 'Deposit',
-                    ],
+                               ],
-                    'links'      => [
+                           ]],
-                        0      => [],
-                        'self' => true,
-                    ],
-                ],
 
             ]
         );
@@ -1427,12 +1423,14 @@ class TransactionControllerTest extends TestCase
         $response->assertJson(
             [
                 'data' => [
-                    'attributes' => [
+                    [
-                        'description' => $journal->description,
+                        'attributes' => [
-                    ],
+                            'description' => $journal->description,
-                    'links'      => [
+                        ],
-                        0      => [],
+                        'links'      => [
-                        'self' => true,
+                            0      => [],
+                            'self' => true,
+                        ],
                     ],
                 ],
 
@@ -2443,4 +2441,4 @@ class TransactionControllerTest extends TestCase
         $response = $this->put('/api/v1/transactions/' . $transaction->id, $data);
         $response->assertStatus(200);
     }
-}
+}

tests/Api/V1/Controllers/UserControllerTest.php

@@ -198,4 +198,4 @@ class UserControllerTest extends TestCase
 
     }
 
-}
+}

tests/Feature/Controllers/Transaction/LinkControllerTest.php

@@ -159,4 +159,4 @@ class LinkControllerTest extends TestCase
 
         $response->assertStatus(302);
     }
-}
+}

tests/Unit/Factory/AccountFactoryTest.php

@@ -393,4 +393,4 @@ class AccountFactoryTest extends TestCase
         $this->assertEquals($account->id, $existing->id);
     }
 
-}
+}

tests/Unit/Factory/BillFactoryTest.php

@@ -165,4 +165,4 @@ class BillFactoryTest extends TestCase
         $this->assertNull($factory->find(null, null));
     }
 
-}
+}

tests/Unit/Factory/BudgetFactoryTest.php

@@ -94,4 +94,4 @@ class BudgetFactoryTest extends TestCase
         $this->assertNull($factory->find(null, 'I dont exist.' . rand(1, 000)));
     }
 
-}
+}

tests/Unit/Factory/CategoryFactoryTest.php

@@ -100,4 +100,4 @@ class CategoryFactoryTest extends TestCase
         $this->assertNull($factory->findOrCreate(null, null));
     }
 
-}
+}

tests/Unit/Factory/PiggyBankEventFactoryTest.php

@@ -132,4 +132,4 @@ class PiggyBankEventFactoryTest extends TestCase
 
     }
 
-}
+}

tests/Unit/Factory/PiggyBankFactoryTest.php

@@ -93,4 +93,4 @@ class PiggyBankFactoryTest extends TestCase
         $factory->setUser($this->user());
         $this->assertNull($factory->find(null, 'I dont exist.' . rand(1, 000)));
     }
-}
+}

tests/Unit/Factory/TagFactoryTest.php

@@ -60,4 +60,4 @@ class TagFactoryTest extends TestCase
         $this->assertEquals($tag, $result->tag);
     }
 
-}
+}

tests/Unit/Factory/TransactionCurrencyFactoryTest.php

@@ -79,4 +79,4 @@ class TransactionCurrencyFactoryTest extends TestCase
         $this->assertNull($factory->find(null, null));
     }
 
-}
+}

tests/Unit/Factory/TransactionFactoryTest.php

@@ -820,4 +820,4 @@ class TransactionFactoryTest extends TestCase
         $this->assertNull($first->foreign_currency_id);
     }
 
-}
+}

tests/Unit/Factory/TransactionJournalFactoryTest.php

@@ -174,4 +174,4 @@ class TransactionJournalFactoryTest extends TestCase
 
     }
 
-}
+}

tests/Unit/Factory/TransactionJournalMetaFactoryTest.php

@@ -102,4 +102,4 @@ class TransactionJournalMetaFactoryTest extends TestCase
     }
 
 
-}
+}

tests/Unit/Import/Configuration/FileConfiguratorTest.php

@@ -685,4 +685,4 @@ class FileConfiguratorTest extends TestCase
 
         return $job;
     }
-}
+}

tests/Unit/Import/Converter/INGDebitCreditTest.php

@@ -60,4 +60,4 @@ class INGDebitCreditTest extends TestCase
         $result    = $converter->convert('Bij');
         $this->assertEquals(1, $result);
     }
-}
+}

tests/Unit/Import/Converter/RabobankDebitCreditTest.php

@@ -60,4 +60,4 @@ class RabobankDebitCreditTest extends TestCase
         $result    = $converter->convert('C');
         $this->assertEquals(1, $result);
     }
-}
+}

tests/Unit/Import/FileProcessor/CsvProcessorTest.php

@@ -343,4 +343,4 @@ class CsvProcessorTest extends TestCase
 
         return $job;
     }
-}
+}

tests/Unit/Import/Mapper/AssetAccountIbansTest.php

@@ -64,4 +64,4 @@ class AssetAccountIbansTest extends TestCase
         $this->assertEquals($result, $mapping);
     }
 
-}
+}

tests/Unit/Import/Mapper/BillsTest.php

@@ -65,4 +65,4 @@ class BillsTest extends TestCase
         $this->assertEquals($result, $mapping);
     }
 
-}
+}

tests/Unit/Import/Mapper/BudgetsTest.php

@@ -63,4 +63,4 @@ class BudgetsTest extends TestCase
         $this->assertEquals($result, $mapping);
     }
 
-}
+}

tests/Unit/Import/Mapper/CategoriesTest.php

@@ -63,4 +63,4 @@ class CategoriesTest extends TestCase
         $this->assertEquals($result, $mapping);
     }
 
-}
+}

tests/Unit/Import/Mapper/OpposingAccountIbansTest.php

@@ -66,4 +66,4 @@ class OpposingAccountIbansTest extends TestCase
         $this->assertEquals($result, $mapping);
     }
 
-}
+}

tests/Unit/Import/Mapper/TagsTest.php

@@ -62,4 +62,4 @@ class TagsTest extends TestCase
         $this->assertEquals($result, $mapping);
     }
 
-}
+}

tests/Unit/Import/Mapper/TransactionCurrenciesTest.php

@@ -65,4 +65,4 @@ class TransactionCurrenciesTest extends TestCase
         $this->assertEquals($result, $mapping);
     }
 
-}
+}

tests/Unit/Import/MapperPreProcess/TagsCommaTest.php

@@ -46,4 +46,4 @@ class TagsCommaTest extends TestCase
 
     }
 
-}
+}

tests/Unit/Import/MapperPreProcess/TagsSpaceTest.php

@@ -45,4 +45,4 @@ class TagsSpaceTest extends TestCase
         $this->assertEquals($output, $result);
     }
 
-}
+}

tests/Unit/Import/Object/ImportAccountTest.php

@@ -126,4 +126,4 @@ class ImportAccountTest extends TestCase
         $importAccount = new ImportAccount;
         $importAccount->getAccount();
     }
-}
+}

tests/Unit/Middleware/AuthenticateTest.php

@@ -113,4 +113,4 @@ class AuthenticateTest extends TestCase
         }
         );
     }
-}
+}

tests/Unit/Middleware/AuthenticateTwoFactorTest.php

@@ -188,4 +188,4 @@ class AuthenticateTwoFactorTest extends TestCase
         }
         );
     }
-}
+}

tests/Unit/Middleware/BinderTest.php

@@ -1533,4 +1533,4 @@ class BinderTest extends TestCase
     }
 
 
-}
+}

tests/Unit/Middleware/IsAdminTest.php

@@ -91,4 +91,4 @@ class IsAdminTest extends TestCase
         }
         );
     }
-}
+}

tests/Unit/Middleware/IsDemoUserTest.php

@@ -79,4 +79,4 @@ class IsDemoUserTest extends TestCase
         }
         );
     }
-}
+}

tests/Unit/Middleware/IsSandstormUserTest.php

@@ -83,4 +83,4 @@ class IsSandstormUserTest extends TestCase
         }
         );
     }
-}
+}

tests/Unit/Middleware/RangeTest.php

@@ -76,4 +76,4 @@ class RangeTest extends TestCase
         }
         );
     }
-}
+}

tests/Unit/Middleware/RedirectIf2FAAuthenticatedTest.php

@@ -91,4 +91,4 @@ class RedirectIf2FAAuthenticatedTest extends TestCase
         }
         );
     }
-}
+}

tests/Unit/Middleware/RedirectIfAuthenticatedTest.php

@@ -66,4 +66,4 @@ class RedirectIfAuthenticatedTest extends TestCase
         }
         );
     }
-}
+}

tests/Unit/Middleware/SandstormTest.php

@@ -177,4 +177,4 @@ class SandstormTest extends TestCase
         }
         );
     }
-}
+}

tests/Unit/Services/Internal/Destroy/AccountDestroyServiceTest.php

@@ -96,4 +96,4 @@ class AccountDestroyServiceTest extends TestCase
         $this->assertDatabaseHas('transactions', ['id' => $transaction->id, 'account_id' => $move->id]);
     }
 
-}
+}

tests/Unit/Services/Internal/Update/AccountUpdateServiceTest.php

@@ -308,4 +308,4 @@ class AccountUpdateServiceTest extends TestCase
         $this->assertEquals($data['notes'], $note->text);
     }
 
-}
+}

tests/Unit/Services/Internal/Update/JournalUpdateServiceTest.php

@@ -220,4 +220,4 @@ class JournalUpdateServiceTest extends TestCase
         $this->assertEquals(2, $result->transactions()->count());
     }
 
-}
+}

tests/Unit/Services/Internal/Update/TransactionUpdateServiceTest.php

@@ -219,4 +219,4 @@ class TransactionUpdateServiceTest extends TestCase
 
 
     }
-}
+}

tests/Unit/TransactionRules/Actions/ClearBudgetTest.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace Tests\Unit\TransactionRules\Actions;
 
 use FireflyIII\Models\RuleAction;
+use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\TransactionRules\Actions\ClearBudget;
 use Tests\TestCase;
@@ -53,5 +54,12 @@ class ClearBudgetTest extends TestCase
 
         // assert result
         $this->assertEquals(0, $journal->budgets()->count());
+
+        /** @var Transaction $transaction */
+        foreach($journal->transactions as $transaction) {
+            $this->assertEquals(0, $transaction->budgets()->count());
+        }
+
+
     }
 }

tests/Unit/TransactionRules/Actions/ClearCategoryTest.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace Tests\Unit\TransactionRules\Actions;
 
 use FireflyIII\Models\RuleAction;
+use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\TransactionRules\Actions\ClearCategory;
 use Tests\TestCase;
@@ -41,7 +42,7 @@ class ClearCategoryTest extends TestCase
         // associate budget with journal:
         $journal  = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first();
         $category = $journal->user->categories()->first();
-        $journal->budgets()->save($category);
+        $journal->categories()->save($category);
         $this->assertGreaterThan(0, $journal->categories()->count());
 
         // fire the action:
@@ -53,5 +54,10 @@ class ClearCategoryTest extends TestCase
 
         // assert result
         $this->assertEquals(0, $journal->categories()->count());
+
+        /** @var Transaction $transaction */
+        foreach($journal->transactions as $transaction) {
+            $this->assertEquals(0, $transaction->categories()->count());
+        }
     }
 }

tests/Unit/TransactionRules/Actions/SetBudgetTest.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace Tests\Unit\TransactionRules\Actions;
 
 use FireflyIII\Models\RuleAction;
+use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\TransactionRules\Actions\SetBudget;
@@ -41,7 +42,7 @@ class SetBudgetTest extends TestCase
     public function testAct()
     {
         // get journal, remove all budgets
-        $journal     = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first();
+        $journal     = TransactionJournal::inRandomOrder()->where('transaction_type_id', 1)->whereNull('deleted_at')->first();
         $budget      = $journal->user->budgets()->first();
         $budgetRepos = $this->mock(BudgetRepositoryInterface::class);
         $budgetRepos->shouldReceive('setUser');
@@ -56,7 +57,10 @@ class SetBudgetTest extends TestCase
         $action                   = new SetBudget($ruleAction);
         $result                   = $action->act($journal);
         $this->assertTrue($result);
-        $this->assertEquals(1, $journal->budgets()->count());
+        /** @var Transaction $transaction */
-        $this->assertEquals($budget->name, $journal->budgets()->first()->name);
+        foreach ($journal->transactions as $transaction) {
+            $this->assertEquals(1, $transaction->budgets()->count());
+            $this->assertEquals($budget->name, $transaction->budgets()->first()->name);
+        }
     }
 }

tests/Unit/TransactionRules/Actions/SetCategoryTest.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace Tests\Unit\TransactionRules\Actions;
 
 use FireflyIII\Models\RuleAction;
+use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\TransactionRules\Actions\SetCategory;
 use Tests\TestCase;
@@ -50,7 +51,13 @@ class SetCategoryTest extends TestCase
         $action                   = new SetCategory($ruleAction);
         $result                   = $action->act($journal);
         $this->assertTrue($result);
-        $this->assertEquals(1, $journal->categories()->count());
+
-        $this->assertEquals($category->name, $journal->categories()->first()->name);
+        /** @var Transaction $transaction */
+        foreach ($journal->transactions as $transaction) {
+            $this->assertEquals(1, $transaction->categories()->count());
+            $this->assertEquals($category->name, $transaction->categories()->first()->name);
+        }
+
+
     }
 }

tests/Unit/TransactionRules/Triggers/BudgetIsTest.php

@@ -36,8 +36,12 @@ class BudgetIsTest extends TestCase
      */
     public function testTriggeredJournal()
     {
-        $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first();
+        do {
-        $budget  = $journal->user->budgets()->first();
+            $journal = TransactionJournal::inRandomOrder()->where('transaction_type_id', 1)->whereNull('deleted_at')->first();
+            $count   = $journal->transactions()->count();
+        } while ($count !== 2);
+
+        $budget = $journal->user->budgets()->first();
         $journal->budgets()->detach();
         $journal->budgets()->save($budget);
         $this->assertEquals(1, $journal->budgets()->count());
@@ -52,7 +56,11 @@ class BudgetIsTest extends TestCase
      */
     public function testTriggeredNotJournal()
     {
-        $journal     = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first();
+        do {
+            $journal = TransactionJournal::inRandomOrder()->where('transaction_type_id', 1)->whereNull('deleted_at')->first();
+            $count   = $journal->transactions()->count();
+        } while ($count !== 2);
+
         $budget      = $journal->user->budgets()->first();
         $otherBudget = $journal->user->budgets()->where('id', '!=', $budget->id)->first();
         $journal->budgets()->detach();
@@ -69,14 +77,21 @@ class BudgetIsTest extends TestCase
      */
     public function testTriggeredTransaction()
     {
-        $journal     = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first();
+        do {
-        $transaction = $journal->transactions()->first();
+            $journal = TransactionJournal::inRandomOrder()->where('transaction_type_id', 1)->whereNull('deleted_at')->first();
+            $count   = $journal->transactions()->count();
+        } while ($count !== 2);
+
+        $transactions = $journal->transactions()->get();
         $budget      = $journal->user->budgets()->first();
 
         $journal->budgets()->detach();
-        $transaction->budgets()->save($budget);
+        foreach($transactions as $transaction) {
+            $transaction->budgets()->save($budget);
+            $this->assertEquals(1, $transaction->budgets()->count());
+        }
+
         $this->assertEquals(0, $journal->budgets()->count());
-        $this->assertEquals(1, $transaction->budgets()->count());
 
         $trigger = BudgetIs::makeFromStrings($budget->name, false);
         $result  = $trigger->triggered($journal);

tests/Unit/TransactionRules/Triggers/HasAnyCategoryTest.php

@@ -70,13 +70,11 @@ class HasAnyCategoryTest extends TestCase
         $journal->categories()->detach();
         $this->assertEquals(0, $journal->categories()->count());
 
-        // append to transaction
+        // append to transaction, not to journal.
         foreach ($journal->transactions()->get() as $index => $transaction) {
-            $transaction->categories()->detach();
+            $transaction->categories()->sync([$category->id]);
-            if (0 === $index) {
-                $transaction->categories()->save($category);
-            }
         }
+        $this->assertEquals(0, $journal->categories()->count());
 
         $trigger = HasAnyCategory::makeFromStrings('', false);
         $result  = $trigger->triggered($journal);

tests/Unit/TransactionRules/Triggers/HasAttachmentTest.php

@@ -37,7 +37,6 @@ class HasAttachmentTest extends TestCase
     public function testTriggered()
     {
         do {
-            // this is kind of cheating but OK.
             $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first();
             $count = $journal->attachments()->count();
         } while($count !== 0);

tests/Unit/TransactionRules/Triggers/HasNoBudgetTest.php

@@ -22,6 +22,7 @@ declare(strict_types=1);
 
 namespace Tests\Unit\TransactionRules\Triggers;
 
+use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\TransactionRules\Triggers\HasNoBudget;
 use Tests\TestCase;
@@ -36,7 +37,7 @@ class HasNoBudgetTest extends TestCase
      */
     public function testTriggeredBudget()
     {
-        $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first();
+        $journal = TransactionJournal::inRandomOrder()->where('transaction_type_id', 1)->whereNull('deleted_at')->first();
         $budget  = $journal->user->budgets()->first();
         $journal->budgets()->detach();
         $journal->budgets()->save($budget);
@@ -52,8 +53,13 @@ class HasNoBudgetTest extends TestCase
      */
     public function testTriggeredNoBudget()
     {
-        $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first();
+        /** @var TransactionJournal $journal */
+        $journal = TransactionJournal::inRandomOrder()->where('transaction_type_id', 1)->whereNull('deleted_at')->first();
         $journal->budgets()->detach();
+        /** @var Transaction $transaction */
+        foreach ($journal->transactions as $transaction) {
+            $transaction->budgets()->detach();
+        }
         $this->assertEquals(0, $journal->budgets()->count());
 
         $trigger = HasNoBudget::makeFromStrings('', false);
@@ -66,14 +72,18 @@ class HasNoBudgetTest extends TestCase
      */
     public function testTriggeredTransaction()
     {
-        $journal     = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first();
+        /** @var TransactionJournal $journal */
-        $transaction = $journal->transactions()->first();
+        $journal      = TransactionJournal::inRandomOrder()->where('transaction_type_id', 1)->whereNull('deleted_at')->first();
-        $budget      = $journal->user->budgets()->first();
+        $transactions = $journal->transactions()->get();
+        $budget       = $journal->user->budgets()->first();
 
         $journal->budgets()->detach();
-        $transaction->budgets()->save($budget);
+        /** @var Transaction $transaction */
+        foreach ($transactions as $transaction) {
+            $transaction->budgets()->sync([$budget->id]);
+            $this->assertEquals(1, $transaction->budgets()->count());
+        }
         $this->assertEquals(0, $journal->budgets()->count());
-        $this->assertEquals(1, $transaction->budgets()->count());
 
         $trigger = HasNoBudget::makeFromStrings('', false);
         $result  = $trigger->triggered($journal);

tests/Unit/Transformers/AccountTransformerTest.php

@@ -421,4 +421,4 @@ class AccountTransformerTest extends TestCase
     }
 
 
-}
+}

tests/Unit/Transformers/AttachmentTransformerTest.php

@@ -61,4 +61,4 @@ class AttachmentTransformerTest extends TestCase
         $this->assertEquals('hello.txt', $result['filename']);
     }
 
-}
+}

tests/Unit/Transformers/BillTransformerTest.php

@@ -146,4 +146,4 @@ class BillTransformerTest extends TestCase
         $this->assertEquals('2018-01-02', $result['paid_dates'][0]);
     }
 
-}
+}

tests/Unit/Transformers/BudgetTransformerTest.php

@@ -55,4 +55,4 @@ class BudgetTransformerTest extends TestCase
         $this->assertEquals($budget->name, $result['name']);
         $this->assertTrue($result['active']);
     }
-}
+}

tests/Unit/Transformers/CategoryTransformerTest.php

@@ -54,4 +54,4 @@ class CategoryTransformerTest extends TestCase
 
         $this->assertEquals($category->name, $result['name']);
     }
-}
+}

tests/Unit/Transformers/JournalMetaTransformerTest.php

@@ -57,4 +57,4 @@ class JournalMetaTransformerTest extends TestCase
         $this->assertEquals($hash, $result['hash']);
     }
 
-}
+}

tests/Unit/Transformers/PiggyBankEventTransformerTest.php

@@ -141,4 +141,4 @@ class PiggyBankEventTransformerTest extends TestCase
         $this->assertEquals(123.45, $result['amount']);
     }
 
-}
+}

tests/Unit/Transformers/PiggyBankTransformerTest.php

@@ -205,4 +205,4 @@ class PiggyBankTransformerTest extends TestCase
         $this->assertEquals($piggy->name, $result['name']);
         $this->assertEquals('I am a note.', $result['notes']);
     }
-}
+}

tests/Unit/Transformers/TagTransformerTest.php

@@ -61,4 +61,4 @@ class TagTransformerTest extends TestCase
         $this->assertEquals(6.6, $result['longitude']);
     }
 
-}
+}

tests/Unit/Transformers/TransactionTransformerTest.php

@@ -1399,4 +1399,4 @@ class TransactionTransformerTest extends TestCase
     }
 
 
-}
+}

tests/Unit/Transformers/UserTransformerTest.php

@@ -64,4 +64,4 @@ class UserTransformerTest extends TestCase
         $this->assertNull($result['role']);
     }
 
-}
+}