diff --git a/app/Classes/General/Eloquent/Filters/HasAccountStatementId.php b/app/Classes/General/Eloquent/Filters/HasAccountStatementId.php index 05cfe9d8..a405be23 100644 --- a/app/Classes/General/Eloquent/Filters/HasAccountStatementId.php +++ b/app/Classes/General/Eloquent/Filters/HasAccountStatementId.php @@ -15,7 +15,7 @@ class HasAccountStatementId implements Filter */ public static function apply(Builder $builder, $value) { - return $builder->whereHas('statementTransaction', function ($query) use ($value) { + return $builder->whereHas('transaction', function ($query) use ($value) { $query->where('account_statement_id', $value); }); } diff --git a/app/Http/Resources/BankStatementDetailResource.php b/app/Http/Resources/BankStatementDetailResource.php new file mode 100644 index 00000000..5087b00b --- /dev/null +++ b/app/Http/Resources/BankStatementDetailResource.php @@ -0,0 +1,31 @@ +transaction; + $accountStatement = $transaction->statement; + return [ + 'id' => $this->id, + 'date' => Carbon::parse($transaction->posting_date)->format('Y-m-d'), + 'transaction_description_1' => $transaction->transaction_description, + 'pay_for' => $transaction->transaction_description_2, + 'system_references' => $this->system, + 'amount' => $transaction->amount, + 'account_statement_date_from' => Carbon::parse($accountStatement->date_from)->format('Y-m-d'), + 'account_statement_date_to' => Carbon::parse($accountStatement->date_to)->format('Y-m-d'), + ]; + } +} diff --git a/resources/assets/vue/components/accounting/sections/StatementTransactionsDetailsComponent.vue b/resources/assets/vue/components/accounting/sections/StatementTransactionsDetailsComponent.vue index 9a5e0058..a0fb4a67 100644 --- a/resources/assets/vue/components/accounting/sections/StatementTransactionsDetailsComponent.vue +++ b/resources/assets/vue/components/accounting/sections/StatementTransactionsDetailsComponent.vue @@ -77,7 +77,8 @@