Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-08 05:24:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for bank transaction rules includes

Browse Source
This commit is contained in:
David Bomba 2023-02-07 11:38:54 +11:00
parent 2eb3136b74
commit f69bd5875f
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/Transformers/BankTransactionRuleTransformer.php
View File

@ -11,13 +11,12 @@
namespace App\Transformers; namespace App\Transformers;
use App\Models\Account;
use App\Models\BankTransaction; use App\Models\BankTransaction;
use App\Models\BankTransactionRule; use App\Models\BankTransactionRule;
use App\Models\Company; use App\Models\Company;
use App\Models\Expense; use App\Models\ExpenseCategory;
use App\Models\Invoice;
use App\Transformers\VendorTransformer; use App\Transformers\VendorTransformer;
use App\Transformers\ExpenseCateogryTransformer;
use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesHash;
/** /**
@ -77,6 +76,9 @@ class BankTransactionRuleTransformer extends EntityTransformer
{ {
$transformer = new ClientTransformer($this->serializer); $transformer = new ClientTransformer($this->serializer);
if(!$bank_transaction_rule->client)
return null;
return $this->includeItem($bank_transaction_rule->expense, $transformer, Client::class); return $this->includeItem($bank_transaction_rule->expense, $transformer, Client::class);
} }
@ -84,7 +86,20 @@ class BankTransactionRuleTransformer extends EntityTransformer
{ {
$transformer = new VendorTransformer($this->serializer); $transformer = new VendorTransformer($this->serializer);
if(!$bank_transaction_rule->vendor)
return null;
return $this->includeItem($bank_transaction_rule->vendor, $transformer, Vendor::class); return $this->includeItem($bank_transaction_rule->vendor, $transformer, Vendor::class);
} }
public function includeExpenseCategory(BankTransactionRule $bank_transaction_rule)
{
$transformer = new ExpenseCategoryTransformer($this->serializer);
if(!$bank_transaction_rule->expense_cateogry)
return null;
return $this->includeItem($bank_transaction_rule->expense_category, $transformer, ExpenseCategory::class);
}
} }