diff --git a/app/Http/Controllers/Accounting/BankStatementController.php b/app/Http/Controllers/Accounting/BankStatementController.php
index ff1324b4..8e5ee138 100644
--- a/app/Http/Controllers/Accounting/BankStatementController.php
+++ b/app/Http/Controllers/Accounting/BankStatementController.php
@@ -129,7 +129,7 @@ class BankStatementController extends Controller
->download($statement->date_from->format('Y-m-d') . '_' . $statement->date_to->format('Y-m-d') . '_statement.csv');
}
- public function fetch(Request $request, ListBankStatementDetailsLogic $logic): JsonResponse
+ public function fetch(Request $request, ListBankStatementTransactionsLogic $logic): JsonResponse
{
return $logic->execute($request);
}
diff --git a/app/Http/Controllers/Imports/ImportStatementInvoiceController.php b/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
index 2535f870..7ea3454e 100644
--- a/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
+++ b/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
@@ -140,8 +140,14 @@ class ImportStatementInvoiceController
$transactions = Transaction::where('original_amount', $row['net_total'])->whereRaw("DATE(created_at) = '$date'")
->whereHas('receiverCompany', function($q) use($row) {
$q->where('debtor',$row['debtor_code']);
- })
- ->get();
+ })->get();
+
+ if ($transactions && $transactions->count() == 0) {
+ $transactions = Transaction::where(DB::raw('FLOOR(original_amount)'), floor($row['net_total']))->whereRaw("DATE(created_at) = '$date'")
+ ->whereHas('receiverCompany', function($q) use($row) {
+ $q->where('debtor',$row['debtor_code']);
+ })->get();
+ }
if ($transactions && $transactions->count() == 1) {
foreach ($transactions as $key => $transaction) {
diff --git a/resources/assets/vue/components/accounting/sections/StatementTransactionsDetailsComponent.vue b/resources/assets/vue/components/accounting/sections/StatementTransactionsDetailsComponent.vue
index a0fb4a67..9ad2162f 100644
--- a/resources/assets/vue/components/accounting/sections/StatementTransactionsDetailsComponent.vue
+++ b/resources/assets/vue/components/accounting/sections/StatementTransactionsDetailsComponent.vue
@@ -65,10 +65,12 @@
@@ -76,11 +78,12 @@
ID
- Date
+ Posting Date
Description 1
- Pay For
- System References
+ Description 2
+ Description 3
+ Description 4
+ Description 5
Amount
Action