From 990b43299c9e2f8f590145cc68e7dba5520db306 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 25 Nov 2022 07:07:12 +1100 Subject: [PATCH] Refactor bank rule column name --- app/Services/Bank/ProcessBankRules.php | 4 ++-- app/Transformers/BankTransactionTransformer.php | 2 +- .../migrations/2022_11_22_215618_lock_tasks_when_invoiced.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Services/Bank/ProcessBankRules.php b/app/Services/Bank/ProcessBankRules.php index 7efb219b589a..86743bcb366d 100644 --- a/app/Services/Bank/ProcessBankRules.php +++ b/app/Services/Bank/ProcessBankRules.php @@ -68,7 +68,7 @@ class ProcessBankRules extends AbstractService //stub for credit rules 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->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->bank_transaction_rule_id = $bank_transaction_rule->id; $this->bank_transaction->save(); if($bank_transaction_rule['auto_convert']) diff --git a/app/Transformers/BankTransactionTransformer.php b/app/Transformers/BankTransactionTransformer.php index f633e050e8cd..483dcc8426cb 100644 --- a/app/Transformers/BankTransactionTransformer.php +++ b/app/Transformers/BankTransactionTransformer.php @@ -67,7 +67,7 @@ class BankTransactionTransformer extends EntityTransformer 'invoice_ids' => (string) $bank_transaction->invoice_ids ?: '', 'expense_id'=> (string) $this->encodePrimaryKey($bank_transaction->expense_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, 'created_at' => (int) $bank_transaction->created_at, 'updated_at' => (int) $bank_transaction->updated_at, diff --git a/database/migrations/2022_11_22_215618_lock_tasks_when_invoiced.php b/database/migrations/2022_11_22_215618_lock_tasks_when_invoiced.php index 105ccb345b96..aedade816870 100644 --- a/database/migrations/2022_11_22_215618_lock_tasks_when_invoiced.php +++ b/database/migrations/2022_11_22_215618_lock_tasks_when_invoiced.php @@ -32,7 +32,7 @@ return new class extends Migration 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)