added route name and id attributes

akaunting · Sep 3, 2020 · cf2c8f0 · cf2c8f0
1 parent 6c8e98e
commit cf2c8f0
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 13 deletions.
diff --git a/app/Models/Banking/Transaction.php b/app/Models/Banking/Transaction.php
@@ -291,4 +291,36 @@ public function getTypeTitleAttribute($value)
     {
         return $value ?? trans_choice('general.' . Str::plural($this->type), 1);
     }
+
+    /**
+     * Get the route name.
+     *
+     * @return string
+     */
+    public function getRouteNameAttribute($value)
+    {
+        if ($value) {
+            return $value;
+        }
+
+        if ($this->isIncome()) {
+            return !empty($this->document_id) ? 'invoices.show' : 'revenues.edit';
+        }
+
+        if ($this->isExpense()) {
+            return !empty($this->document_id) ? 'bills.show' : 'payments.edit';
+        }
+
+        return 'transactions.index';
+    }
+
+    /**
+     * Get the route id.
+     *
+     * @return string
+     */
+    public function getRouteIdAttribute($value)
+    {
+        return $value ?? $this->document_id ?? $this->id;
+    }
 }
diff --git a/resources/views/banking/transactions/index.blade.php b/resources/views/banking/transactions/index.blade.php
@@ -34,31 +34,27 @@
                 <thead class="thead-light">
                     <tr class="row table-head-line">
                         <th class="col-sm-2 col-md-2 d-none d-sm-block">@sortablelink('paid_at', trans('general.date'))</th>
-                        <th class="col-xs-4 col-sm-3 col-md-2">@sortablelink('account.name', trans_choice('general.accounts', 1))</th>
+                        <th class="col-xs-4 col-sm-2 col-md-2 text-right">@sortablelink('amount', trans('general.amount'))</th>
                         <th class="col-xs-4 col-sm-3 col-md-2">@sortablelink('type', trans_choice('general.types', 1))</th>
                         <th class="col-sm-2 col-md-2 d-none d-sm-block">@sortablelink('category.name', trans_choice('general.categories', 1))</th>
+                        <th class="col-xs-4 col-sm-3 col-md-2">@sortablelink('account.name', trans_choice('general.accounts', 1))</th>
                         <th class="col-md-2 d-none d-md-block">@sortablelink('description', trans('general.description'))</th>
-                        <th class="col-xs-4 col-sm-2 col-md-2 text-right">@sortablelink('amount', trans('general.amount'))</th>
                     </tr>
                 </thead>
 
                 <tbody>
                     @foreach($transactions as $item)
                         <tr class="row align-items-center border-top-1 tr-py">
-                            <td class="col-sm-2 col-md-2 d-none d-sm-block">@date($item->paid_at)</td>
-                            <td class="col-xs-4 col-sm-3 col-md-2">{{ $item->account->name }}</td>
+                            <td class="col-sm-2 col-md-2 d-none d-sm-block">
+                                <a href="{{ route($item->route_name, $item->route_id) }}">
+                                    @date($item->paid_at)
+                                </a>
+                            </td>
+                            <td class="col-xs-4 col-sm-2 col-md-2 text-right">@money($item->amount, $item->currency_code, true)</td>
                             <td class="col-xs-4 col-sm-3 col-md-2">{{ $item->type_title }}</td>
                             <td class="col-sm-2 col-md-2 d-none d-sm-block">{{ $item->category->name }}</td>
+                            <td class="col-xs-4 col-sm-3 col-md-2">{{ $item->account->name }}</td>
                             <td class="col-md-2 d-none d-md-block long-texts">{{ $item->description }}</td>
-                            <td class="col-xs-4 col-sm-2 col-md-2 text-right">
-                                @php
-                                    $id = !empty($item->document_id) ? $item->document_id : $item->id;
-                                    $route = ($item->type == 'income') ? (!empty($item->document_id) ? 'invoices.show' : 'revenues.edit') : (!empty($item->document_id) ? 'bills.show' : 'payments.edit');
-                                @endphp
-                                <a href="{{ route($route, $id) }}">
-                                    @money($item->amount, $item->currency_code, true)
-                                </a>
-                            </td>
                         </tr>
                     @endforeach
                 </tbody>