From f10fa2e8e8b63f12ec5713ec6a333bdad861a427 Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Sat, 28 Nov 2020 22:48:52 +0800 Subject: [PATCH] Improve subscription views --- resources/views/subscriptions/create.blade.php | 28 ++++++++++---------- resources/views/subscriptions/edit.blade.php | 28 ++++++++++---------- resources/views/subscriptions/index.blade.php | 30 +++++++++++----------- .../subscriptions/partials/breadcrumb.blade.php | 4 +-- .../views/subscriptions/partials/delete.blade.php | 8 +++--- .../partials/subscription-show.blade.php | 18 ++++++------- resources/views/subscriptions/show.blade.php | 6 ++--- 7 files changed, 61 insertions(+), 61 deletions(-) diff --git a/resources/views/subscriptions/create.blade.php b/resources/views/subscriptions/create.blade.php index 304d101..bca9dd1 100755 --- a/resources/views/subscriptions/create.blade.php +++ b/resources/views/subscriptions/create.blade.php @@ -1,45 +1,45 @@ @extends('layouts.app') -@section('title', trans('subscription.create')) +@section('title', __('subscription.create')) @section('content')
{!! Form::open(['route' => 'subscriptions.store']) !!}
-

{{ trans('subscription.create') }}

+

{{ __('subscription.create') }}

- {!! FormField::text('name', ['label' => trans('subscription.name')]) !!} + {!! FormField::text('name', ['label' => __('subscription.name')]) !!}
- {!! FormField::price('price', ['label' => trans('subscription.price'), 'currency' => Option::get('money_sign', 'Rp')]) !!} + {!! FormField::price('price', ['label' => __('subscription.price'), 'currency' => Option::get('money_sign', 'Rp')]) !!}
- {!! FormField::text('start_date', ['label' => trans('subscription.start_date')]) !!} + {!! FormField::text('start_date', ['label' => __('subscription.start_date')]) !!}
- {!! FormField::text('due_date', ['label' => trans('subscription.due_date')]) !!} + {!! FormField::text('due_date', ['label' => __('subscription.due_date')]) !!}
- {!! FormField::select('project_id', $projects, ['label' => trans('subscription.project'), 'value' => Request::get('project_id')]) !!} - {!! FormField::select('vendor_id', $vendors, ['label' => trans('subscription.vendor'), 'value' => Request::get('vendor_id')]) !!} - {!! FormField::radios('type_id', SubscriptionType::toArray(), ['label' => trans('subscription.type'), 'value' => Request::get('type_id')]) !!} - {!! FormField::textarea('notes', ['label' => trans('subscription.notes')]) !!} + {!! FormField::select('project_id', $projects, ['label' => __('subscription.project'), 'value' => Request::get('project_id')]) !!} + {!! FormField::select('vendor_id', $vendors, ['label' => __('subscription.vendor'), 'value' => Request::get('vendor_id')]) !!} + {!! FormField::radios('type_id', SubscriptionType::toArray(), ['label' => __('subscription.type'), 'value' => Request::get('type_id')]) !!} + {!! FormField::textarea('notes', ['label' => __('subscription.notes')]) !!}
- {!! Form::submit(trans('subscription.create'), ['class' => 'btn btn-primary']) !!} - {!! link_to_route('subscriptions.index', trans('app.cancel'), [], ['class' => 'btn btn-default']) !!} + {!! Form::submit(__('subscription.create'), ['class' => 'btn btn-primary']) !!} + {!! link_to_route('subscriptions.index', __('app.cancel'), [], ['class' => 'btn btn-default']) !!}
{!! Form::close() !!} diff --git a/resources/views/subscriptions/edit.blade.php b/resources/views/subscriptions/edit.blade.php index ae04e9e..8baf4df 100755 --- a/resources/views/subscriptions/edit.blade.php +++ b/resources/views/subscriptions/edit.blade.php @@ -15,41 +15,41 @@

{{ $pageTitle }}

-
{!! FormField::radios('type_id', SubscriptionType::toArray(), ['label' => trans('subscription.type'), 'value' => Request::get('type_id')]) !!}
-
{!! FormField::radios('status_id', [trans('app.in_active'), trans('app.active')], ['label' => trans('app.status')]) !!}
+
{!! FormField::radios('type_id', SubscriptionType::toArray(), ['label' => __('subscription.type'), 'value' => Request::get('type_id')]) !!}
+
{!! FormField::radios('status_id', [__('app.in_active'), __('app.active')], ['label' => __('app.status')]) !!}
- {!! FormField::text('name', ['label' => trans('subscription.name')]) !!} + {!! FormField::text('name', ['label' => __('subscription.name')]) !!}
- {!! FormField::price('price', ['label' => trans('subscription.price'), 'currency' => Option::get('money_sign', 'Rp')]) !!} + {!! FormField::price('price', ['label' => __('subscription.price'), 'currency' => Option::get('money_sign', 'Rp')]) !!}
- {!! FormField::text('start_date', ['label' => trans('subscription.start_date')]) !!} + {!! FormField::text('start_date', ['label' => __('subscription.start_date')]) !!}
- {!! FormField::text('due_date', ['label' => trans('subscription.due_date')]) !!} + {!! FormField::text('due_date', ['label' => __('subscription.due_date')]) !!}
- {!! FormField::select('project_id', $projects, ['label' => trans('subscription.project')]) !!} - {!! FormField::select('vendor_id', $vendors, ['label' => trans('subscription.vendor')]) !!} - {!! FormField::textarea('notes', ['label' => trans('subscription.notes')]) !!} + {!! FormField::select('project_id', $projects, ['label' => __('subscription.project')]) !!} + {!! FormField::select('vendor_id', $vendors, ['label' => __('subscription.vendor')]) !!} + {!! FormField::textarea('notes', ['label' => __('subscription.notes')]) !!}
- {!! Form::submit(trans('subscription.update'), ['class' => 'btn btn-primary']) !!} + {!! Form::submit(__('subscription.update'), ['class' => 'btn btn-primary']) !!}
{!! Form::close() !!}
- @lang('app.action') -

{!! link_to_route('subscriptions.show', trans('subscription.back_to_show'), [$subscription->id], ['class' => 'btn btn-info']) !!}

-

{!! link_to_route('subscriptions.index', trans('subscription.back_to_index'), [], ['class' => 'btn btn-default']) !!}

-

{!! link_to_route('subscriptions.edit', trans('subscription.delete'), [$subscription->id, 'action' => 'delete'], ['class' => 'btn btn-danger']) !!}

+ {{ __('app.action') }} +

{!! link_to_route('subscriptions.show', __('subscription.back_to_show'), [$subscription->id], ['class' => 'btn btn-info']) !!}

+

{!! link_to_route('subscriptions.index', __('subscription.back_to_index'), [], ['class' => 'btn btn-default']) !!}

+

{!! link_to_route('subscriptions.edit', __('subscription.delete'), [$subscription->id, 'action' => 'delete'], ['class' => 'btn btn-danger']) !!}

@endif diff --git a/resources/views/subscriptions/index.blade.php b/resources/views/subscriptions/index.blade.php index 49c9c09..55b14be 100755 --- a/resources/views/subscriptions/index.blade.php +++ b/resources/views/subscriptions/index.blade.php @@ -1,30 +1,30 @@ @extends('layouts.app') -@section('title', trans('subscription.subscriptions')) +@section('title', __('subscription.subscriptions')) @section('content')

- {!! link_to_route('subscriptions.create', trans('subscription.create'), [], ['class'=>'btn btn-success pull-right']) !!} - {{ trans('subscription.subscriptions') }} {{ $subscriptions->total() }} {{ trans('subscription.found') }} + {!! link_to_route('subscriptions.create', __('subscription.create'), [], ['class' => 'btn btn-success pull-right']) !!} + {{ __('subscription.subscriptions') }} {{ $subscriptions->total() }} {{ __('subscription.found') }}

- {!! Form::open(['method'=>'get','class'=>'form-inline']) !!} - {!! Form::text('q', request('q'), ['class'=>'form-control index-search-field','placeholder'=>trans('subscription.search'),'style' => 'width:350px']) !!} - {!! Form::submit(trans('subscription.search'), ['class' => 'btn btn-info btn-sm']) !!} + {!! Form::open(['method' => 'get','class' => 'form-inline']) !!} + {!! Form::text('q', request('q'), ['class' => 'form-control index-search-field','placeholder' =>__('subscription.search'),'style' => 'width:350px']) !!} + {!! Form::submit(__('subscription.search'), ['class' => 'btn btn-info btn-sm']) !!} {!! link_to_route('subscriptions.index','Reset',[],['class' => 'btn btn-default btn-sm']) !!} {!! Form::close() !!}
- - - - - - - - + + + + + + + + @forelse($subscriptions as $key => $subscription) @@ -42,7 +42,7 @@ @empty - + @endforelse diff --git a/resources/views/subscriptions/partials/breadcrumb.blade.php b/resources/views/subscriptions/partials/breadcrumb.blade.php index 5d18636..76ec5f8 100644 --- a/resources/views/subscriptions/partials/breadcrumb.blade.php +++ b/resources/views/subscriptions/partials/breadcrumb.blade.php @@ -1,5 +1,5 @@ diff --git a/resources/views/subscriptions/partials/delete.blade.php b/resources/views/subscriptions/partials/delete.blade.php index 6ff97a8..2abfdc1 100755 --- a/resources/views/subscriptions/partials/delete.blade.php +++ b/resources/views/subscriptions/partials/delete.blade.php @@ -1,16 +1,16 @@
-

{{ trans('subscription.delete') }}

+

{{ __('subscription.delete') }}

@include('subscriptions.partials.subscription-show')
- {{ trans('app.delete_confirm') }} + {{ __('app.delete_confirm') }}
- {!! link_to_route('subscriptions.edit', trans('app.cancel'), [$subscription->id], ['class' => 'btn btn-default']) !!} + {!! link_to_route('subscriptions.edit', __('app.cancel'), [$subscription->id], ['class' => 'btn btn-default']) !!} {!! FormField::delete( ['route' => ['subscriptions.destroy', $subscription->id]], - trans('app.delete_confirm_button'), + __('app.delete_confirm_button'), ['class' => 'btn btn-danger'], ['subscription_id' => $subscription->id] ) !!} diff --git a/resources/views/subscriptions/partials/subscription-show.blade.php b/resources/views/subscriptions/partials/subscription-show.blade.php index aa359fb..c77aea6 100644 --- a/resources/views/subscriptions/partials/subscription-show.blade.php +++ b/resources/views/subscriptions/partials/subscription-show.blade.php @@ -1,18 +1,18 @@
{{ trans('app.table_no') }}{{ trans('subscription.name') }}{{ trans('app.type') }}{{ trans('subscription.customer') }}{{ trans('subscription.due_date') }}{{ trans('subscription.extension_price') }}{{ trans('subscription.vendor') }}{{ trans('app.status') }}{{ __('app.table_no') }}{{ __('subscription.name') }}{{ __('app.type') }}{{ __('subscription.customer') }}{{ __('subscription.due_date') }}{{ __('subscription.extension_price') }}{{ __('subscription.vendor') }}{{ __('app.status') }}
{{ trans('subscription.not_found') }}{{ __('subscription.not_found') }}
- - - - - - + + + + + + - + - - + +
{{ trans('subscription.name') }}{{ $subscription->name }}
{{ trans('subscription.price') }}{{ format_money($subscription->price) }}
{{ trans('subscription.type') }}{{ $subscription->type }}
{{ trans('subscription.start_date') }}{{ date_id($subscription->start_date) }}
{{ trans('subscription.due_date') }}{{ date_id($subscription->due_date) }}
{{ trans('subscription.customer') }}{{ $subscription->customer->nameLink() }}
{{ __('subscription.name') }}{{ $subscription->name }}
{{ __('subscription.price') }}{{ format_money($subscription->price) }}
{{ __('subscription.type') }}{{ $subscription->type }}
{{ __('subscription.start_date') }}{{ date_id($subscription->start_date) }}
{{ __('subscription.due_date') }}{{ date_id($subscription->due_date) }}
{{ __('subscription.customer') }}{{ $subscription->customer->nameLink() }}
{{ trans('subscription.project') }}{{ __('subscription.project') }} {{ link_to_route('projects.subscriptions', $subscription->project->name, [$subscription->project_id]) }}
{{ trans('subscription.vendor') }}{{ $subscription->vendor->name }}
{{ trans('subscription.notes') }}{!! nl2br($subscription->notes) !!}
{{ __('subscription.vendor') }}{{ $subscription->vendor->name }}
{{ __('subscription.notes') }}{!! nl2br($subscription->notes) !!}
diff --git a/resources/views/subscriptions/show.blade.php b/resources/views/subscriptions/show.blade.php index 3d345c7..cca37c3 100755 --- a/resources/views/subscriptions/show.blade.php +++ b/resources/views/subscriptions/show.blade.php @@ -13,9 +13,9 @@
- @lang('app.action') -

{!! link_to_route('subscriptions.edit', trans('subscription.edit'), [$subscription->id], ['class' => 'btn btn-warning']) !!}

-

{!! link_to_route('subscriptions.index', trans('subscription.back_to_index'), [], ['class' => 'btn btn-default']) !!}

+ {{ __('app.action') }} +

{!! link_to_route('subscriptions.edit', __('subscription.edit'), [$subscription->id], ['class' => 'btn btn-warning']) !!}

+

{!! link_to_route('subscriptions.index', __('subscription.back_to_index'), [], ['class' => 'btn btn-default']) !!}

@endsection