diff --git a/resources/views/rules/partials/trigger.twig b/resources/views/rules/partials/trigger.twig
index 2db8dfd5a7..c5aade93c8 100644
--- a/resources/views/rules/partials/trigger.twig
+++ b/resources/views/rules/partials/trigger.twig
@@ -23,13 +23,11 @@
- {#
- {% if errors.has(('rule-trigger-value.'~count)) %}
+ {% if errors.has('rule_triggers.'~count~'.value') %}
- {{ errors.first('rule-trigger-value.'~count) }}
+ {{ errors.first('rule_triggers.'~count~'.value') }}
{% endif %}
- #}
|
diff --git a/routes/web.php b/routes/web.php
index a492dec37a..37b1e07c94 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -546,6 +546,7 @@ Route::group(
Route::get('expense-accounts', ['uses' => 'Json\AutoCompleteController@expenseAccounts', 'as' => 'expense-accounts']);
Route::get('all-accounts', ['uses' => 'Json\AutoCompleteController@allAccounts', 'as' => 'all-accounts']);
Route::get('revenue-accounts', ['uses' => 'Json\AutoCompleteController@revenueAccounts', 'as' => 'revenue-accounts']);
+ Route::get('asset-accounts', ['uses' => 'Json\AutoCompleteController@assetAccounts', 'as' => 'asset-accounts']);
Route::get('categories', ['uses' => 'Json\AutoCompleteController@categories', 'as' => 'categories']);
Route::get('budgets', ['uses' => 'Json\AutoCompleteController@budgets', 'as' => 'budgets']);
Route::get('tags', ['uses' => 'Json\AutoCompleteController@tags', 'as' => 'tags']);
diff --git a/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php b/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php
index 727e662f8c..718eb6f86a 100644
--- a/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php
+++ b/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php
@@ -78,6 +78,25 @@ class AutoCompleteControllerTest extends TestCase
}
+ /**
+ * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
+ */
+ public function testAssetAccounts(): void
+ {
+ // mock stuff
+ $accountA = factory(Account::class)->make();
+ $collection = new Collection([$accountA]);
+ $accountRepos = $this->mock(AccountRepositoryInterface::class);
+ $accountRepos->shouldReceive('getAccountsByType')
+ ->withArgs([[AccountType::DEFAULT, AccountType::ASSET]])->andReturn($collection);
+
+ $this->be($this->user());
+ $response = $this->get(route('json.asset-accounts'));
+ $response->assertStatus(200);
+ $response->assertExactJson([$accountA->name]);
+
+ }
+
/**
* @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
*/
diff --git a/tests/Unit/TransactionRules/Actions/ConvertToDepositTest.php b/tests/Unit/TransactionRules/Actions/ConvertToDepositTest.php
new file mode 100644
index 0000000000..d934385e36
--- /dev/null
+++ b/tests/Unit/TransactionRules/Actions/ConvertToDepositTest.php
@@ -0,0 +1,124 @@
+.
+ */
+
+declare(strict_types=1);
+
+namespace Tests\Unit\TransactionRules\Actions;
+
+
+use Exception;
+use FireflyIII\Factory\AccountFactory;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Models\RuleAction;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\TransactionRules\Actions\ConvertToDeposit;
+use Log;
+use Tests\TestCase;
+
+/**
+ *
+ * Class ConvertToDepositTest
+ */
+class ConvertToDepositTest extends TestCase
+{
+ /**
+ *
+ */
+ public function setUp(): void
+ {
+ parent::setUp();
+ Log::info(sprintf('Now in %s.', \get_class($this)));
+ }
+
+ /**
+ * Convert a withdrawal to a deposit.
+ *
+ * @covers \FireflyIII\TransactionRules\Actions\ConvertToDeposit
+ */
+ public function testActWithdrawal()
+ {
+ $revenue = $this->getRandomRevenue();
+ $name = 'Random revenue #' . random_int(1, 10000);
+ $journal = $this->getRandomWithdrawal();
+
+ // journal is a withdrawal:
+ $this->assertEquals(TransactionType::WITHDRAWAL, $journal->transactionType->type);
+
+ // mock used stuff:
+ $factory = $this->mock(AccountFactory::class);
+ $factory->shouldReceive('setUser')->once();
+ $factory->shouldReceive('findOrCreate')->once()->withArgs([$name, AccountType::REVENUE])->andReturn($revenue);
+
+
+ // fire the action:
+ $ruleAction = new RuleAction;
+ $ruleAction->action_value = $name;
+ $action = new ConvertToDeposit($ruleAction);
+ try {
+ $result = $action->act($journal);
+ } catch (Exception $e) {
+ $this->assertTrue(false, $e->getMessage());
+ }
+ $this->assertTrue($result);
+
+ // journal is now a deposit.
+ $journal->refresh();
+ $this->assertEquals(TransactionType::DEPOSIT, $journal->transactionType->type);
+ }
+
+ /**
+ * Convert a transfer to a deposit.
+ *
+ * @covers \FireflyIII\TransactionRules\Actions\ConvertToDeposit
+ */
+ public function testActTransfer()
+ {
+ $revenue = $this->getRandomRevenue();
+ $name = 'Random revenue #' . random_int(1, 10000);
+ $journal = $this->getRandomTransfer();
+
+ // journal is a transfer:
+ $this->assertEquals(TransactionType::TRANSFER, $journal->transactionType->type);
+
+ // mock used stuff:
+ $factory = $this->mock(AccountFactory::class);
+ $factory->shouldReceive('setUser')->once();
+ $factory->shouldReceive('findOrCreate')->once()->withArgs([$name, AccountType::REVENUE])->andReturn($revenue);
+
+
+ // fire the action:
+ $ruleAction = new RuleAction;
+ $ruleAction->action_value = $name;
+ $action = new ConvertToDeposit($ruleAction);
+ try {
+ $result = $action->act($journal);
+ } catch (Exception $e) {
+ $this->assertTrue(false, $e->getMessage());
+ }
+ $this->assertTrue($result);
+
+ // journal is now a deposit.
+ $journal->refresh();
+ $this->assertEquals(TransactionType::DEPOSIT, $journal->transactionType->type);
+ }
+
+
+}
\ No newline at end of file
diff --git a/tests/Unit/TransactionRules/Actions/ConvertToTransferTest.php b/tests/Unit/TransactionRules/Actions/ConvertToTransferTest.php
new file mode 100644
index 0000000000..3c3a3efe77
--- /dev/null
+++ b/tests/Unit/TransactionRules/Actions/ConvertToTransferTest.php
@@ -0,0 +1,123 @@
+.
+ */
+
+declare(strict_types=1);
+
+namespace Tests\Unit\TransactionRules\Actions;
+
+
+use Exception;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Models\RuleAction;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\TransactionRules\Actions\ConvertToTransfer;
+use Log;
+use Tests\TestCase;
+
+/**
+ *
+ * Class ConvertToTransferTest
+ */
+class ConvertToTransferTest extends TestCase
+{
+ /**
+ *
+ */
+ public function setUp(): void
+ {
+ parent::setUp();
+ Log::info(sprintf('Now in %s.', \get_class($this)));
+ }
+
+ /**
+ * Convert a deposit to a transfer.
+ *
+ * @covers \FireflyIII\TransactionRules\Actions\ConvertToTransfer
+ */
+ public function testActDeposit(): void
+ {
+ $deposit = $this->getRandomDeposit();
+ /** @var Account $asset */
+ $asset = $this->user()->accounts()->where('name', 'Bitcoin Account')->first();
+ // journal is a withdrawal:
+ $this->assertEquals(TransactionType::DEPOSIT, $deposit->transactionType->type);
+
+ // mock used stuff:
+ $accountRepos = $this->mock(AccountRepositoryInterface::class);
+ $accountRepos->shouldReceive('setUser')->once();
+ $accountRepos->shouldReceive('findByName')->withArgs([$asset->name, [AccountType::ASSET, AccountType::DEFAULT]])->andReturn($asset);
+
+ // fire the action:
+ $ruleAction = new RuleAction;
+ $ruleAction->action_value = $asset->name;
+ $action = new ConvertToTransfer($ruleAction);
+
+ try {
+ $result = $action->act($deposit);
+ } catch (Exception $e) {
+ $this->assertTrue(false, $e->getMessage());
+ }
+ $this->assertTrue($result);
+
+ // journal is now a transfer.
+ $deposit->refresh();
+ $this->assertEquals(TransactionType::TRANSFER, $deposit->transactionType->type);
+ }
+
+ /**
+ * Convert a withdrawal to a transfer.
+ *
+ * @covers \FireflyIII\TransactionRules\Actions\ConvertToTransfer
+ */
+ public function testActWithdrawal(): void
+ {
+ $withdrawal = $this->getRandomWithdrawal();
+ /** @var Account $asset */
+ $asset = $this->user()->accounts()->where('name', 'Bitcoin Account')->first();
+ // journal is a withdrawal:
+ $this->assertEquals(TransactionType::WITHDRAWAL, $withdrawal->transactionType->type);
+
+ // mock used stuff:
+ $accountRepos = $this->mock(AccountRepositoryInterface::class);
+ $accountRepos->shouldReceive('setUser')->once();
+ $accountRepos->shouldReceive('findByName')->withArgs([$asset->name, [AccountType::ASSET, AccountType::DEFAULT]])->andReturn($asset);
+
+ // fire the action:
+ $ruleAction = new RuleAction;
+ $ruleAction->action_value = $asset->name;
+ $action = new ConvertToTransfer($ruleAction);
+
+ try {
+ $result = $action->act($withdrawal);
+ } catch (Exception $e) {
+ $this->assertTrue(false, $e->getMessage());
+ }
+ $this->assertTrue($result);
+
+ // journal is now a transfer.
+ $withdrawal->refresh();
+ $this->assertEquals(TransactionType::TRANSFER, $withdrawal->transactionType->type);
+ }
+
+
+}
\ No newline at end of file
diff --git a/tests/Unit/TransactionRules/Actions/ConvertToWithdrawalTest.php b/tests/Unit/TransactionRules/Actions/ConvertToWithdrawalTest.php
new file mode 100644
index 0000000000..720cb0e80d
--- /dev/null
+++ b/tests/Unit/TransactionRules/Actions/ConvertToWithdrawalTest.php
@@ -0,0 +1,124 @@
+.
+ */
+
+declare(strict_types=1);
+
+namespace Tests\Unit\TransactionRules\Actions;
+
+
+use Exception;
+use FireflyIII\Factory\AccountFactory;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Models\RuleAction;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\TransactionRules\Actions\ConvertToWithdrawal;
+use Log;
+use Tests\TestCase;
+
+/**
+ *
+ * Class ConvertToWithdrawalTest
+ */
+class ConvertToWithdrawalTest extends TestCase
+{
+ /**
+ *
+ */
+ public function setUp(): void
+ {
+ parent::setUp();
+ Log::info(sprintf('Now in %s.', \get_class($this)));
+ }
+
+ /**
+ * Convert a deposit to a withdrawal.
+ *
+ * @covers \FireflyIII\TransactionRules\Actions\ConvertToWithdrawal
+ */
+ public function testActDeposit()
+ {
+ $expense = $this->getRandomExpense();
+ $name = 'Random expense #' . random_int(1, 10000);
+ $deposit = $this->getRandomDeposit();
+
+ // journal is a deposit:
+ $this->assertEquals(TransactionType::DEPOSIT, $deposit->transactionType->type);
+
+ // mock used stuff:
+ $factory = $this->mock(AccountFactory::class);
+ $factory->shouldReceive('setUser')->once();
+ $factory->shouldReceive('findOrCreate')->once()->withArgs([$name, AccountType::EXPENSE])->andReturn($expense);
+
+
+ // fire the action:
+ $ruleAction = new RuleAction;
+ $ruleAction->action_value = $name;
+ $action = new ConvertToWithdrawal($ruleAction);
+ try {
+ $result = $action->act($deposit);
+ } catch (Exception $e) {
+ $this->assertTrue(false, $e->getMessage());
+ }
+ $this->assertTrue($result);
+
+ // journal is now a withdrawal.
+ $deposit->refresh();
+ $this->assertEquals(TransactionType::WITHDRAWAL, $deposit->transactionType->type);
+ }
+
+ /**
+ * Convert a transfer to a deposit.
+ *
+ * @covers \FireflyIII\TransactionRules\Actions\ConvertToWithdrawal
+ */
+ public function testActTransfer()
+ {
+ $expense = $this->getRandomExpense();
+ $name = 'Random expense #' . random_int(1, 10000);
+ $transfer = $this->getRandomTransfer();
+
+ // journal is a transfer:
+ $this->assertEquals(TransactionType::TRANSFER, $transfer->transactionType->type);
+
+ // mock used stuff:
+ $factory = $this->mock(AccountFactory::class);
+ $factory->shouldReceive('setUser')->once();
+ $factory->shouldReceive('findOrCreate')->once()->withArgs([$name, AccountType::EXPENSE])->andReturn($expense);
+
+
+ // fire the action:
+ $ruleAction = new RuleAction;
+ $ruleAction->action_value = $name;
+ $action = new ConvertToWithdrawal($ruleAction);
+ try {
+ $result = $action->act($transfer);
+ } catch (Exception $e) {
+ $this->assertTrue(false, $e->getMessage());
+ }
+ $this->assertTrue($result);
+
+ // journal is now a deposit.
+ $transfer->refresh();
+ $this->assertEquals(TransactionType::WITHDRAWAL, $transfer->transactionType->type);
+ }
+
+
+}
\ No newline at end of file
|