Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 00:11:35 +02:00
Code Issues Releases Activity

adding additional fields to bank_transactions

Browse Source 
https://github.com/invoiceninja/invoiceninja/issues/8042
This commit is contained in:
paulwer 2023-12-13 16:30:26 +01:00
parent e12fb1f765
commit 7a70eb873f
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Helpers/Bank/Nordigen/Transformer/TransactionTransformer.php
View File

@ -105,8 +105,8 @@ class TransactionTransformer implements BankRevenueInterface
'category_type' => array_key_exists('additionalInformation', $transaction) ? $transaction["additionalInformation"] : '', // TODO: institution specific keys like: GUTSCHRIFT, ABSCHLUSS, MONATSABSCHLUSS etc
'date' => $transaction["bookingDate"],
'description' => $description,
// 'description' => `IBAN: ${elem . json["bank_debtorAccount"] && elem . json["bank_debtorAccount"]["iban"] ? elem . json["bank_debtorAccount"]["iban"] : ' -'}\nVerwendungszweck: ${elem . json["bank_remittanceInformationStructured"] || ' -'}\nName: ${elem . json["bank_debtorName"] || ' -'}`, // 2 fields to get data from (structured and structuredArray (have to be joined))
// TODO: debitor name & iban & bic
'debitor' => array_key_exists('debtorAccount', $transaction) && array_key_exists('iban', $transaction["debtorAccount"]) ? $transaction['debtorAccount']['iban'] : null,
'debitor_name' => array_key_exists('debtorName', $transaction) ? $transaction['debtorName'] : null,
'base_type' => (int) $transaction["transactionAmount"]["amount"] <= 0 ? 'DEBIT' : 'CREDIT',
];

12
app/Models/BankTransaction.php
View File

@ -34,6 +34,8 @@ use Illuminate\Database\Eloquent\SoftDeletes;
* @property string|null $date
* @property int $bank_account_id
* @property string|null $description
* @property string|null $debitor
* @property string|null $debitor_name
* @property string $invoice_ids
* @property int|null $expense_id
* @property int|null $vendor_id
@ -68,7 +70,7 @@ class BankTransaction extends BaseModel
use SoftDeletes;
use MakesHash;
use Filterable;
const STATUS_UNMATCHED = 1;
const STATUS_MATCHED = 2;
@ -84,10 +86,12 @@ class BankTransaction extends BaseModel
'base_type',
'expense_id',
'vendor_id',
'amount'
'amount',
'debitor',
'debitor_name'
];
public function getInvoiceIds()
{
$collection = collect();
@ -162,7 +166,7 @@ class BankTransaction extends BaseModel
// return $this->belongsTo(Expense::class)->withTrashed();
// }
public function service() :BankService
public function service(): BankService
{
return new BankService($this);
}

6
database/migrations/2023_11_26_082959_add_bank_integration_id.php
View File

@ -31,6 +31,12 @@ return new class extends Migration {
$table->renameColumn('bank_integration_account_id', 'bank_integration_yodlee_account_id');
});
// MAYBE migration of account->bank_account_id etc
Schema::table('bank_transactions', function (Blueprint $table) {
$table->string('debitor')->nullable(); // iban, credit-card info or else
$table->string('debitor_name')->nullable(); // name
});
}
/**