Added Revenue/Payment show page

app/Http/Controllers/Purchases/Payments.php

@@ -40,9 +40,9 @@ class Payments extends Controller
      *
      * @return Response
      */
-    public function show()
+    public function show(Transaction $payment)
     {
-        return redirect()->route('payments.index');
+        return view('purchases.payments.show', compact('payment'));
     }
 
     /**
@@ -91,7 +91,7 @@ class Payments extends Controller
         $response = $this->ajaxDispatch(new CreateTransaction($request));
 
         if ($response['success']) {
-            $response['redirect'] = route('payments.index');
+            $response['redirect'] = route('payments.show', $response['data']->id);
 
             $message = trans('messages.success.added', ['type' => trans_choice('general.payments', 1)]);
 
@@ -206,7 +206,7 @@ class Payments extends Controller
         $response = $this->ajaxDispatch(new UpdateTransaction($payment, $request));
 
         if ($response['success']) {
-            $response['redirect'] = route('payments.index');
+            $response['redirect'] = route('payments.show', $payment->id);
 
             $message = trans('messages.success.updated', ['type' => trans_choice('general.payments', 1)]);
 

app/Http/Controllers/Sales/Revenues.php

@@ -40,9 +40,9 @@ class Revenues extends Controller
      *
      * @return Response
      */
-    public function show()
+    public function show(Transaction $revenue)
     {
-        return redirect()->route('revenues.index');
+        return view('sales.revenues.show', compact('revenue'));
     }
 
     /**
@@ -91,7 +91,7 @@ class Revenues extends Controller
         $response = $this->ajaxDispatch(new CreateTransaction($request));
 
         if ($response['success']) {
-            $response['redirect'] = route('revenues.index');
+            $response['redirect'] = route('revenues.show', $response['data']->id);
 
             $message = trans('messages.success.added', ['type' => trans_choice('general.revenues', 1)]);
 
@@ -206,7 +206,7 @@ class Revenues extends Controller
         $response = $this->ajaxDispatch(new UpdateTransaction($revenue, $request));
 
         if ($response['success']) {
-            $response['redirect'] = route('revenues.index');
+            $response['redirect'] = route('revenues.show', $revenue->id);
 
             $message = trans('messages.success.updated', ['type' => trans_choice('general.revenues', 1)]);
 

app/Models/Banking/Transaction.php

@@ -371,11 +371,11 @@ class Transaction extends Model
         }
 
         if ($this->isIncome()) {
-            return !empty($this->document_id) ? 'invoices.show' : 'revenues.edit';
+            return !empty($this->document_id) ? 'invoices.show' : 'revenues.show';
         }
 
         if ($this->isExpense()) {
-            return !empty($this->document_id) ? 'bills.show' : 'payments.edit';
+            return !empty($this->document_id) ? 'bills.show' : 'payments.show';
         }
 
         return 'transactions.index';

resources/views/purchases/payments/index.blade.php

@@ -49,7 +49,7 @@
                                 @if ($item->reconciled)
                                     <td class="col-xs-4 col-sm-4 col-md-3 col-lg-1 col-xl-1"><a class="col-aka" href="#">@date($item->paid_at)</a></td>
                                 @else
-                                    <td class="col-xs-4 col-sm-4 col-md-3 col-lg-1 col-xl-1"><a class="col-aka" href="{{ route('payments.edit', $item->id) }}">@date($item->paid_at)</a></td>
+                                    <td class="col-xs-4 col-sm-4 col-md-3 col-lg-1 col-xl-1"><a class="col-aka" href="{{ route('payments.show', $item->id) }}">@date($item->paid_at)</a></td>
                                 @endif
                                 <td class="col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-2 text-right">@money($item->amount, $item->currency_code, true)</td>
                                 <td class="col-md-2 col-lg-3 col-xl-3 d-none d-md-block text-left">
@@ -85,16 +85,20 @@
                                             <i class="fa fa-ellipsis-h text-muted"></i>
                                         </a>
                                         <div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow">
+                                            <a class="dropdown-item" href="{{ route('payments.show', $item->id) }}">{{ trans('general.show') }}</a>
+
                                             @if (!$item->reconciled)
                                                 <a class="dropdown-item" href="{{ route('payments.edit', $item->id) }}">{{ trans('general.edit') }}</a>
                                                 <div class="dropdown-divider"></div>
                                             @endif
+
                                             @if (empty($item->document_id))
                                             @can('create-purchases-payments')
                                                 <a class="dropdown-item" href="{{ route('payments.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a>
                                                 <div class="dropdown-divider"></div>
                                             @endcan
                                             @endif
+
                                             @if (!$item->reconciled)
                                             @can('delete-purchases-payments')
                                                 {!! Form::deleteLink($item, 'payments.destroy') !!}

resources/views/purchases/payments/show.blade.php

@@ -0,0 +1,21 @@
+@extends('layouts.admin')
+
+@section('title', trans_choice('general.payments', 2))
+
+@section('new_button')
+    @can('create-purchases-payments')
+        <a href="{{ route('payments.create') }}" class="btn btn-success btn-sm">{{ trans('general.add_new') }}</a>
+        <a href="{{ route('import.create', ['group' => 'purchases', 'type' => 'payments']) }}" class="btn btn-white btn-sm">{{ trans('import.import') }}</a>
+    @endcan
+    <a href="{{ route('payments.export', request()->input()) }}" class="btn btn-white btn-sm">{{ trans('general.export') }}</a>
+@endsection
+
+@section('content')
+    <div class="card">
+
+    </div>
+@endsection
+
+@push('scripts_start')
+    <script src="{{ asset('public/js/purchases/payments.js?v=' . version('short')) }}"></script>
+@endpush

resources/views/sales/revenues/index.blade.php

@@ -49,7 +49,7 @@
                                 @if ($item->reconciled)
                                     <td class="col-xs-4 col-sm-4 col-md-3 col-lg-1 col-xl-1"><a class="col-aka" href="#">@date($item->paid_at)</a></td>
                                 @else
-                                    <td class="col-xs-4 col-sm-4 col-md-3 col-lg-1 col-xl-1"><a class="col-aka" href="{{ route('revenues.edit', $item->id) }}">@date($item->paid_at)</a></td>
+                                    <td class="col-xs-4 col-sm-4 col-md-3 col-lg-1 col-xl-1"><a class="col-aka" href="{{ route('revenues.show', $item->id) }}">@date($item->paid_at)</a></td>
                                 @endif
                                 <td class="col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-2 text-right">@money($item->amount, $item->currency_code, true)</td>
                                 <td class="col-md-2 col-lg-3 col-xl-3 d-none d-md-block text-left">
@@ -85,16 +85,20 @@
                                             <i class="fa fa-ellipsis-h text-muted"></i>
                                         </a>
                                         <div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow">
+                                            <a class="dropdown-item" href="{{ route('revenues.show', $item->id) }}">{{ trans('general.show') }}</a>
+
                                             @if (!$item->reconciled)
                                                 <a class="dropdown-item" href="{{ route('revenues.edit', $item->id) }}">{{ trans('general.edit') }}</a>
                                                 <div class="dropdown-divider"></div>
                                             @endif
+
                                             @if (empty($item->document_id))
                                             @can('create-sales-revenues')
                                                 <a class="dropdown-item" href="{{ route('revenues.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a>
                                                 <div class="dropdown-divider"></div>
                                             @endcan
                                             @endif
+
                                             @if (!$item->reconciled)
                                             @can('delete-sales-revenues')
                                                 {!! Form::deleteLink($item, 'revenues.destroy') !!}

resources/views/sales/revenues/show.blade.php

@@ -0,0 +1,20 @@
+@extends('layouts.admin')
+
+@section('title', trans_choice('general.revenues', 2))
+
+@section('new_button')
+    @can('create-sales-revenues')
+        <a href="{{ route('revenues.create') }}" class="btn btn-success btn-sm">{{ trans('general.add_new') }}</a>
+        <a href="{{ route('import.create', ['group' => 'sales', 'type' => 'revenues']) }}" class="btn btn-white btn-sm">{{ trans('import.import') }}</a>
+    @endcan
+    <a href="{{ route('revenues.export', request()->input()) }}" class="btn btn-white btn-sm">{{ trans('general.export') }}</a>
+@endsection
+
+@section('content')
+    <div class="card">
+    </div>
+@endsection
+
+@push('scripts_start')
+    <script src="{{ asset('public/js/sales/revenues.js?v=' . version('short')) }}"></script>
+@endpush