Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-02 22:57:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactor bank rule column name

Browse Source
This commit is contained in:
David Bomba 2022-11-25 07:07:12 +11:00
parent fa5c364556
commit 990b43299c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,7 @@ class ProcessBankRules extends AbstractService
//stub for credit rules //stub for credit rules
foreach($this->credit_rules as $rule) foreach($this->credit_rules as $rule)
{ {
// $this->bank_transaction->bank_rule_id = $bank_transaction_rule->id; // $this->bank_transaction->bank_transaction_rule_id = $bank_transaction_rule->id;
} }
@ -115,7 +115,7 @@ class ProcessBankRules extends AbstractService
$this->bank_transaction->vendor_id = $bank_transaction_rule->vendor_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->ninja_category_id = $bank_transaction_rule->category_id;
$this->bank_transaction->status_id = BankTransaction::STATUS_MATCHED; $this->bank_transaction->status_id = BankTransaction::STATUS_MATCHED;
$this->bank_transaction->bank_rule_id = $bank_transaction_rule->id; $this->bank_transaction->bank_transaction_rule_id = $bank_transaction_rule->id;
$this->bank_transaction->save(); $this->bank_transaction->save();
if($bank_transaction_rule['auto_convert']) if($bank_transaction_rule['auto_convert'])

2
app/Transformers/BankTransactionTransformer.php
View File

@ -67,7 +67,7 @@ class BankTransactionTransformer extends EntityTransformer
'invoice_ids' => (string) $bank_transaction->invoice_ids ?: '', 'invoice_ids' => (string) $bank_transaction->invoice_ids ?: '',
'expense_id'=> (string) $this->encodePrimaryKey($bank_transaction->expense_id) ?: '', 'expense_id'=> (string) $this->encodePrimaryKey($bank_transaction->expense_id) ?: '',
'vendor_id'=> (string) $this->encodePrimaryKey($bank_transaction->vendor_id) ?: '', 'vendor_id'=> (string) $this->encodePrimaryKey($bank_transaction->vendor_id) ?: '',
'bank_rule_id' => (string) $this->encodePrimaryKey($bank_transaction->bank_rule_id) ?: '', 'bank_transaction_rule_id' => (string) $this->encodePrimaryKey($bank_transaction->bank_transaction_rule_id) ?: '',
'is_deleted' => (bool) $bank_transaction->is_deleted, 'is_deleted' => (bool) $bank_transaction->is_deleted,
'created_at' => (int) $bank_transaction->created_at, 'created_at' => (int) $bank_transaction->created_at,
'updated_at' => (int) $bank_transaction->updated_at, 'updated_at' => (int) $bank_transaction->updated_at,

2
database/migrations/2022_11_22_215618_lock_tasks_when_invoiced.php
View File

@ -32,7 +32,7 @@ return new class extends Migration
Schema::table('bank_transactions', function (Blueprint $table) Schema::table('bank_transactions', function (Blueprint $table)
{ {
$table->bigInteger('bank_rule_id')->nullable(); $table->bigInteger('bank_transaction_rule_id')->nullable();
}); });
Schema::table('subscriptions', function (Blueprint $table) Schema::table('subscriptions', function (Blueprint $table)