From cae2842786b82d28f8264a47a3ffd0a77fc1bf54 Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Sat, 9 Jul 2016 19:10:25 +0800 Subject: [PATCH] Update 2016-07-09.19.10 Reformat payment views --- resources/views/payments/create.blade.php | 9 +++++---- resources/views/payments/delete.blade.php | 15 ++------------- resources/views/payments/edit.blade.php | 18 +++++++++++++----- .../views/payments/partials/payment-show.blade.php | 15 +++++++++++++++ resources/views/payments/show.blade.php | 16 +--------------- resources/views/projects/payments.blade.php | 6 +++++- 6 files changed, 41 insertions(+), 38 deletions(-) create mode 100644 resources/views/payments/partials/payment-show.blade.php diff --git a/resources/views/payments/create.blade.php b/resources/views/payments/create.blade.php index 3f77680..cfeea2c 100755 --- a/resources/views/payments/create.blade.php +++ b/resources/views/payments/create.blade.php @@ -3,7 +3,8 @@ @section('title', trans('payment.create')) @section('content') -

+ +
{!! Form::open(['route'=>'payments.store']) !!}
@@ -18,9 +19,9 @@ {!! FormField::price('amount', ['label'=> trans('payment.amount')]) !!}
- {!! FormField::select('project_id', $projects, ['label'=> trans('payment.project')]) !!} - {!! FormField::select('customer_id', $customers, ['label'=> trans('payment.customer')]) !!} - {!! FormField::textarea('description',['label'=> trans('payment.description')]) !!} + {!! FormField::select('project_id', $projects, ['label'=> trans('payment.project'),'value' => Request::get('project_id')]) !!} + {!! FormField::select('customer_id', $customers, ['label'=> trans('payment.customer'),'value' => Request::get('customer_id')]) !!} + {!! FormField::textarea('description',['label'=> trans('payment.description'),'rows' => 3]) !!}
diff --git a/resources/views/payments/delete.blade.php b/resources/views/payments/delete.blade.php index 676c3e0..49e653e 100755 --- a/resources/views/payments/delete.blade.php +++ b/resources/views/payments/delete.blade.php @@ -11,19 +11,8 @@ {!! link_to_route('payments.show', trans('app.cancel'), [$payment->id], ['class' => 'btn btn-default']) !!}
-
-
-

{{ trans('payment.payments') }} Detail

-
- - - - - - -
{{ trans('payment.date') }}{{ $payment->date }}
{{ trans('payment.amount') }}{{ formatRp($payment->amount) }}
{{ trans('payment.description') }}{{ $payment->description }}
-
-
+
+ @include('payments.partials.payment-show')
@endsection \ No newline at end of file diff --git a/resources/views/payments/edit.blade.php b/resources/views/payments/edit.blade.php index 1cbafb5..f0142ad 100755 --- a/resources/views/payments/edit.blade.php +++ b/resources/views/payments/edit.blade.php @@ -3,12 +3,14 @@ @section('title', trans('payment.edit')) @section('content') -

-
+@include('payments.partials.breadcrumb',['title' => trans('payment.edit')]) + +
+
{!! Form::model($payment, ['route'=>['payments.update', $payment->id], 'method' => 'patch']) !!}

{{ trans('payment.edit') }}

-
+
{!! FormField::radios('type', ['Pengeluaran','Pemasukan'], ['label'=> trans('payment.type')]) !!}
@@ -18,8 +20,14 @@ {!! FormField::text('amount',['label'=> trans('payment.amount'),'addon' => ['before'=>'Rp'],'type' => 'number','class' => 'text-right']) !!}
- {!! FormField::select('project_id', $projects, ['label'=> trans('payment.project')]) !!} - {!! FormField::select('customer_id', $customers, ['label'=> trans('payment.customer')]) !!} +
+
+ {!! FormField::select('project_id', $projects, ['label'=> trans('payment.project')]) !!} +
+
+ {!! FormField::select('customer_id', $customers, ['label'=> trans('payment.customer')]) !!} +
+
{!! FormField::textarea('description',['label'=> trans('payment.description')]) !!}
diff --git a/resources/views/payments/partials/payment-show.blade.php b/resources/views/payments/partials/payment-show.blade.php new file mode 100644 index 0000000..0359ddf --- /dev/null +++ b/resources/views/payments/partials/payment-show.blade.php @@ -0,0 +1,15 @@ +
+

{{ trans('payment.show') }}

+ + + + + + + +
{{ trans('payment.date') }}{{ $payment->date }}
{{ trans('payment.amount') }}{{ $payment->present()->amount }}
{{ trans('payment.description') }}{{ $payment->description }}
{{ trans('payment.customer') }}{{ $payment->customer->name }}
+
+ {!! link_to_route('payments.edit', trans('payment.edit'), [$payment->id], ['class' => 'btn btn-warning']) !!} + {!! link_to_route('payments.index', trans('payment.back_to_index'), [], ['class' => 'btn btn-default']) !!} +
+
diff --git a/resources/views/payments/show.blade.php b/resources/views/payments/show.blade.php index 7638d3e..83207c6 100755 --- a/resources/views/payments/show.blade.php +++ b/resources/views/payments/show.blade.php @@ -7,21 +7,7 @@

{{ trans('payment.show') }}

-
-

{{ trans('payment.show') }}

- - - - - - - -
{{ trans('payment.date') }}{{ $payment->date }}
{{ trans('payment.amount') }}{{ $payment->present()->amount }}
{{ trans('payment.description') }}{{ $payment->description }}
{{ trans('payment.customer') }}{{ $payment->customer->name }}
-
- {!! link_to_route('payments.edit', trans('payment.edit'), [$payment->id], ['class' => 'btn btn-warning']) !!} - {!! link_to_route('payments.index', trans('payment.back_to_index'), [], ['class' => 'btn btn-default']) !!} -
-
+ @include('payments.partials.payment-show')
@endsection \ No newline at end of file diff --git a/resources/views/projects/payments.blade.php b/resources/views/projects/payments.blade.php index 22fa803..9e25bee 100755 --- a/resources/views/projects/payments.blade.php +++ b/resources/views/projects/payments.blade.php @@ -41,7 +41,11 @@ {{ formatRp($total) }} - {!! html_link_to_route('payments.create', trans('payment.create'), [$project->id], ['class' => 'btn btn-primary','icon' => 'plus']) !!} + + + {!! html_link_to_route('payments.create', trans('payment.create'), ['project_id' => $project->id,'customer_id' => $project->customer_id], ['class' => 'btn btn-primary','icon' => 'plus']) !!} + +