diff --git a/app/Http/Controllers/Purchases/Payments.php b/app/Http/Controllers/Purchases/Payments.php index c46880d32..de34559dc 100644 --- a/app/Http/Controllers/Purchases/Payments.php +++ b/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)]); diff --git a/app/Http/Controllers/Sales/Revenues.php b/app/Http/Controllers/Sales/Revenues.php index 10ec8abd0..463f04ff3 100644 --- a/app/Http/Controllers/Sales/Revenues.php +++ b/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)]); diff --git a/app/Models/Banking/Transaction.php b/app/Models/Banking/Transaction.php index 9d0fe7f35..ca039c12d 100644 --- a/app/Models/Banking/Transaction.php +++ b/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'; diff --git a/resources/views/purchases/payments/index.blade.php b/resources/views/purchases/payments/index.blade.php index bf84a0a6c..3c551b587 100644 --- a/resources/views/purchases/payments/index.blade.php +++ b/resources/views/purchases/payments/index.blade.php @@ -49,7 +49,7 @@ @if ($item->reconciled) @date($item->paid_at) @else - @date($item->paid_at) + @date($item->paid_at) @endif @money($item->amount, $item->currency_code, true) @@ -85,16 +85,20 @@