Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 13:12:50 +01:00
Code Issues Releases Activity

Fixes for rules

Browse Source
This commit is contained in:
David Bomba 2022-11-23 22:14:36 +11:00
parent 428f42c723
commit 08630874b8
2 changed files with 55 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Services/Bank/ProcessBankRules.php
View File

@ -112,8 +112,8 @@ class ProcessBankRules extends AbstractService
{
// $this->bank_transaction->client_id = empty($rule['client_id']) ? null : $rule['client_id'];
$this->bank_transaction->vendor_id = empty($rule['vendor_id']) ? null : $rule['vendor_id'];
$this->bank_transaction->ninja_category_id = empty($rule['category_id']) ? null : $rule['category_id'];
$this->bank_transaction->vendor_id = $bank_transaction_rule->vendor_id;
$this->bank_transaction->ninja_category_id = $bank_transaction_rule->category_id;
$this->bank_transaction->status_id = BankTransaction::STATUS_MATCHED;
$this->bank_transaction->bank_rule_id = $bank_transaction_rule->id;
$this->bank_transaction->save();
@ -122,7 +122,7 @@ class ProcessBankRules extends AbstractService
{
$expense = ExpenseFactory::create($this->bank_transaction->company_id, $this->bank_transaction->user_id);
$expense->category_id = $this->bank_transaction->ninja_category_id ?: $this->resolveCategory();
$expense->category_id = $bank_transaction_rule->category_id ?: $this->resolveCategory();
$expense->amount = $this->bank_transaction->amount;
$expense->number = $this->getNextExpenseNumber($expense);
$expense->currency_id = $this->bank_transaction->currency_id;
@ -130,7 +130,7 @@ class ProcessBankRules extends AbstractService
$expense->payment_date = Carbon::parse($this->bank_transaction->date);
$expense->transaction_reference = $this->bank_transaction->description;
$expense->transaction_id = $this->bank_transaction->id;
$expense->vendor_id = $this->bank_transaction->vendor_id;
$expense->vendor_id = $bank_transaction_rule->vendor_id;
$expense->invoice_documents = $this->bank_transaction->company->invoice_expense_documents;
$expense->should_be_invoiced = $this->bank_transaction->company->mark_expenses_invoiceable;
$expense->save();

51
tests/Feature/Bank/BankTransactionRuleTest.php
View File

@ -42,6 +42,57 @@ class BankTransactionRuleTest extends TestCase
$this->withoutExceptionHandling();
}
public function testValidationContainsRule()
{
//[{"search_key":"description","operator":"contains","value":"hello"}]
$br = BankTransactionRule::factory()->create([
'company_id' => $this->company->id,
'user_id' => $this->user->id,
'matches_on_all' => false,
'auto_convert' => true,
'applies_to' => 'DEBIT',
'client_id' => $this->client->id,
'vendor_id' => $this->vendor->id,
'category_id' =>$this->expense_category->id,
'rules' => [
[
'search_key' => 'description',
'operator' => 'contains',
'value' => 'hello',
]
]
]);
$bi = BankIntegration::factory()->create([
'company_id' => $this->company->id,
'user_id' => $this->user->id,
'account_id' => $this->account->id,
]);
$bt = BankTransaction::factory()->create([
'bank_integration_id' => $bi->id,
'company_id' => $this->company->id,
'user_id' => $this->user->id,
'description' => 'HellO ThErE CowBoY',
'base_type' => 'DEBIT',
'amount' => 100
]);
$bt->service()->processRules();
$bt = $bt->fresh();
$this->assertNotNull($bt->expense_id);
$this->assertNotNull($bt->expense->category_id);
$this->assertNotNull($bt->expense->vendor_id);
}
public function testUpdateValidationRules()
{