From 714e2dd92acd535846a1cf9ae204b7c4687067f5 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Fri, 10 Nov 2017 15:16:14 +0800
Subject: [PATCH] Restructure payment detail page

---
 app/Entities/Payments/Payment.php                  |  2 +-
 resources/lang/id/payment.php                      | 44 +++++++++++-----------
 .../views/payments/partials/breadcrumb.blade.php   |  4 +-
 .../views/payments/partials/payment-show.blade.php | 11 ++----
 resources/views/payments/show.blade.php            | 23 ++++++-----
 tests/Feature/Payments/ManagePaymentsTest.php      |  2 +-
 6 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/app/Entities/Payments/Payment.php b/app/Entities/Payments/Payment.php
index 17a28b9..e44aad0 100755
--- a/app/Entities/Payments/Payment.php
+++ b/app/Entities/Payments/Payment.php
@@ -12,7 +12,7 @@ class Payment extends Model
     use PresentableTrait;
 
     protected $presenter = PaymentPresenter::class;
-    protected $guarded   = ['id', 'created_at', 'updated_at'];
+    protected $guarded = ['id', 'created_at', 'updated_at'];
 
     public function project()
     {
diff --git a/resources/lang/id/payment.php b/resources/lang/id/payment.php
index 7bba539..02ec76f 100644
--- a/resources/lang/id/payment.php
+++ b/resources/lang/id/payment.php
@@ -14,27 +14,29 @@ return [
     'words_amount'  => 'Terbilang',
 
     // Actions
-    'create'        => 'Input Pembayaran Baru',
-    'created'       => 'Input Pembayaran baru telah berhasil.',
-    'show'          => 'Detail Pembayaran',
-    'edit'          => 'Edit Pembayaran',
-    'update'        => 'Update Pembayaran',
-    'updated'       => 'Update data Pembayaran telah berhasil.',
-    'delete'        => 'Hapus Pembayaran',
-    'deleted'       => 'Hapus data Pembayaran telah berhasil.',
-    'undeleted'     => 'Data Pembayaran gagal dihapus.',
-    'search'        => 'Cari Pembayaran Project',
-    'print'         => 'Cetak Kuitansi',
+    'create'    => 'Input Pembayaran Baru',
+    'created'   => 'Input Pembayaran baru telah berhasil.',
+    'show'      => 'Lihat Detail Pembayaran',
+    'detail'    => 'Detail Pembayaran',
+    'edit'      => 'Edit Pembayaran',
+    'update'    => 'Update Pembayaran',
+    'updated'   => 'Update data Pembayaran telah berhasil.',
+    'delete'    => 'Hapus Pembayaran',
+    'deleted'   => 'Hapus data Pembayaran telah berhasil.',
+    'undeleted' => 'Data Pembayaran gagal dihapus.',
+    'search'    => 'Cari Pembayaran Project',
+    'print'     => 'Cetak Kuitansi',
 
     // Attrubutes
-    'description'   => 'Untuk Pembayaran',
-    'date'          => 'Tanggal Pembayaran',
-    'in_out'        => 'Jenis Transaksi',
-    'type'          => 'Jenis Pembayaran',
-    'project'       => 'Project',
-    'customer'      => 'Dari/Kepada',
-    'amount'        => 'Jumlah',
-    'cash_in'       => 'Pemasukan',
-    'cash_out'      => 'Pengeluaran',
-    'payer'         => 'Pembayar',
+    'id'          => 'ID Pembayaran',
+    'description' => 'Untuk Pembayaran',
+    'date'        => 'Tanggal Pembayaran',
+    'in_out'      => 'Jenis Transaksi',
+    'type'        => 'Jenis Pembayaran',
+    'project'     => 'Project',
+    'customer'    => 'Dari/Kepada',
+    'amount'      => 'Jumlah',
+    'cash_in'     => 'Pemasukan',
+    'cash_out'    => 'Pengeluaran',
+    'payer'       => 'Pembayar',
 ];
diff --git a/resources/views/payments/partials/breadcrumb.blade.php b/resources/views/payments/partials/breadcrumb.blade.php
index d60953e..e43d3c3 100644
--- a/resources/views/payments/partials/breadcrumb.blade.php
+++ b/resources/views/payments/partials/breadcrumb.blade.php
@@ -2,5 +2,5 @@
     <li>{{ link_to_route('projects.index',trans('project.projects')) }}</li>
     <li>{{ $payment->present()->projectLink }}</li>
     <li>{{ $payment->present()->projectPaymentsLink }}</li>
-    <li class="active">{{ isset($title) ? $title : trans('payment.show') }}</li>
-</ul>
\ No newline at end of file
+    <li class="active">{{ isset($title) ? $title : trans('payment.detail') }}</li>
+</ul>
diff --git a/resources/views/payments/partials/payment-show.blade.php b/resources/views/payments/partials/payment-show.blade.php
index 6342efb..45f8b85 100644
--- a/resources/views/payments/partials/payment-show.blade.php
+++ b/resources/views/payments/partials/payment-show.blade.php
@@ -1,17 +1,12 @@
 <div class="panel panel-default">
-    <div class="panel-heading"><h3 class="panel-title">{{ trans('payment.show') }}</h3></div>
     <table class="table table-condensed">
         <tbody>
+            <tr><th class="col-xs-4">{{ trans('payment.id') }}</th><td>#{{ $payment->id }}</td></tr>
             <tr><th>{{ trans('payment.date') }}</th><td>{{ $payment->date }}</td></tr>
             <tr><th>{{ trans('payment.in_out') }}</th><td>{{ $payment->in_out ? trans('payment.cash_in') : trans('payment.cash_out') }}</td></tr>
-            <tr><th>{{ trans('payment.type') }}</th><td>{{ $payment->present()->type_id }}</td></tr>
-            <tr><th>{{ trans('payment.amount') }}</th><td class="text-right">{{ $payment->present()->amount }}</td></tr>
-            <tr><th>{{ trans('payment.description') }}</th><td>{{ $payment->description }}</td></tr>
             <tr><th>{{ trans('payment.customer') }}</th><td>{{ $payment->partner->name }}</td></tr>
+            <tr><th>{{ trans('payment.amount') }}</th><td class="lead">{{ $payment->present()->amount }}</td></tr>
+            <tr><th>{{ trans('payment.description') }}</th><td>{{ $payment->description }}</td></tr>
         </tbody>
     </table>
-    <div class="panel-footer">
-        {!! link_to_route('payments.edit', trans('payment.edit'), [$payment->id], ['class' => 'btn btn-warning']) !!}
-        {!! link_to_route('projects.payments', 'Kembali ke Daftar Pembayaran Project', [$payment->project_id], ['class' => 'btn btn-default']) !!}
-    </div>
 </div>
diff --git a/resources/views/payments/show.blade.php b/resources/views/payments/show.blade.php
index 46ce1fb..d019d3c 100755
--- a/resources/views/payments/show.blade.php
+++ b/resources/views/payments/show.blade.php
@@ -1,19 +1,22 @@
 @extends('layouts.app')
 
-@section('title', trans('payment.show'))
+@section('title', trans('payment.detail'))
 
 @section('content')
+
 @include('payments.partials.breadcrumb')
-<h1 class="page-header">
-    <div class="pull-right">
-        {!! link_to_route('payments.pdf', trans('payment.print'), [$payment->id], ['class' => 'btn btn-success']) !!}
-        {!! link_to_route('payments.index', 'Lihat Semua Pembayaran', [], ['class' => 'btn btn-default']) !!}
-    </div>
-    {{ trans('payment.show') }}
-</h1>
+
 <div class="row">
-    <div class="col-md-5">
+    <div class="col-md-5 col-lg-offset-2">
+        <legend>@lang('payment.detail') <small class="pull-right text-muted">{{ trans('app.type') }} : {{ $payment->type() }}</small></legend>
         @include('payments.partials.payment-show')
     </div>
+    <div class="col-md-3 text-center">
+        <legend>@lang('app.action')</legend>
+        <p>{!! link_to_route('payments.pdf', trans('payment.print'), [$payment->id], ['class' => 'btn btn-success']) !!}</p>
+        <p>{!! link_to_route('payments.edit', trans('payment.edit'), [$payment->id], ['class' => 'btn btn-warning']) !!}</p>
+        <p>{!! link_to_route('projects.payments', 'Kembali ke Daftar Pembayaran Project', [$payment->project_id], ['class' => 'btn btn-default']) !!}</p>
+        <p>{!! link_to_route('payments.index', 'Lihat Semua Pembayaran', [], ['class' => 'btn btn-default']) !!}</p>
+    </div>
 </div>
-@endsection
\ No newline at end of file
+@endsection
diff --git a/tests/Feature/Payments/ManagePaymentsTest.php b/tests/Feature/Payments/ManagePaymentsTest.php
index 4b83a50..d65eaf4 100644
--- a/tests/Feature/Payments/ManagePaymentsTest.php
+++ b/tests/Feature/Payments/ManagePaymentsTest.php
@@ -122,7 +122,7 @@ class ManagePaymentsTest extends TestCase
         $this->visit(route('payments.index'));
         $this->click(trans('app.show'));
         $this->seePageIs(route('payments.show', $payment->id));
-        $this->see(trans('payment.show'));
+        $this->see(trans('payment.detail'));
         $this->see($payment->date);
         $this->see(formatRp($payment->amount));
         $this->see($payment->description);