From c80f1099953d711202a5358bfddff46d9e3c7f44 Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Tue, 20 Feb 2018 06:47:25 +0800 Subject: [PATCH] Update money sign on price form fields Fixed some code styles on views Update job progress html export page --- resources/lang/id/job.php | 1 + .../partials/draft-item-list.blade.php | 14 ++++++++++++-- .../views/invoices/partials/item-list.blade.php | 14 ++++++++++++-- resources/views/jobs/create.blade.php | 16 ++++++++-------- resources/views/jobs/edit.blade.php | 16 ++++++++-------- resources/views/payments/create.blade.php | 2 +- resources/views/payments/edit.blade.php | 2 +- resources/views/projects/create.blade.php | 14 +++++++------- resources/views/projects/edit.blade.php | 22 +++++++++++----------- resources/views/projects/fees/create.blade.php | 8 ++++---- .../projects/jobs/progress-export-html.blade.php | 6 +++--- resources/views/subscriptions/create.blade.php | 8 ++++---- resources/views/subscriptions/edit.blade.php | 22 +++++++++++----------- 13 files changed, 83 insertions(+), 62 deletions(-) diff --git a/resources/lang/id/job.php b/resources/lang/id/job.php index 8d81749..fa5a8a3 100644 --- a/resources/lang/id/job.php +++ b/resources/lang/id/job.php @@ -6,6 +6,7 @@ return [ 'list' => 'Daftar Job', 'additional' => 'Daftar Job Tambahan', 'on_progress' => 'Job on Progress', + 'detail' => 'Detail Job', 'search' => 'Cari Job', 'found' => 'Job ditemukan', 'not_found' => 'Job tidak ditemukan', diff --git a/resources/views/invoice-drafts/partials/draft-item-list.blade.php b/resources/views/invoice-drafts/partials/draft-item-list.blade.php index 522d09b..7eaf9f8 100644 --- a/resources/views/invoice-drafts/partials/draft-item-list.blade.php +++ b/resources/views/invoice-drafts/partials/draft-item-list.blade.php @@ -31,7 +31,12 @@ {!! FormField::price( 'amount['.$key.']', - ['id' => 'amount-'.$key, 'value' => $item->amount, 'label' => false] + [ + 'id' => 'amount-'.$key, + 'value' => $item->amount, + 'label' => false, + 'currency' => Option::get('money_sign', 'Rp') + ] ) !!} {{ Form::submit('Update', ['id' => 'update-item-'.$key, 'class' => 'btn btn-success btn-xs pull-right']) }} @@ -59,7 +64,12 @@ {!! FormField::price( 'new_item_amount', - ['id' => 'new_item_amount', 'label' => false, 'placeholder' => trans('invoice.item_amount')] + [ + 'id' => 'new_item_amount', + 'label' => false, + 'placeholder' => trans('invoice.item_amount'), + 'currency' => Option::get('money_sign', 'Rp') + ] ) !!} {{ Form::submit(trans('invoice.add_item'), ['class' => 'btn btn-primary btn-block']) }} diff --git a/resources/views/invoices/partials/item-list.blade.php b/resources/views/invoices/partials/item-list.blade.php index ea4d7db..195d424 100644 --- a/resources/views/invoices/partials/item-list.blade.php +++ b/resources/views/invoices/partials/item-list.blade.php @@ -31,7 +31,12 @@ {!! FormField::price( 'amount['.$key.']', - ['id' => 'amount-'.$key, 'value' => $item['amount'], 'label' => false] + [ + 'id' => 'amount-'.$key, + 'value' => $item['amount'], + 'label' => false, + 'currency' => Option::get('money_sign', 'Rp') + ] ) !!} {{ Form::submit('Update', ['id' => 'update-item-'.$key, 'class' => 'btn btn-success btn-xs pull-right']) }} @@ -59,7 +64,12 @@ {!! FormField::price( 'new_item_amount', - ['id' => 'new_item_amount', 'label' => false, 'placeholder' => trans('invoice.item_amount')] + [ + 'id' => 'new_item_amount', + 'label' => false, + 'placeholder' => trans('invoice.item_amount'), + 'currency' => Option::get('money_sign', 'Rp') + ] ) !!} {{ Form::submit(trans('invoice.add_item'), ['class' => 'btn btn-primary btn-block']) }} diff --git a/resources/views/jobs/create.blade.php b/resources/views/jobs/create.blade.php index 808e4cb..bb63939 100755 --- a/resources/views/jobs/create.blade.php +++ b/resources/views/jobs/create.blade.php @@ -3,7 +3,7 @@ @section('title', trans('job.create')) @section('content') -@include('projects.partials.breadcrumb',['title' => trans('job.create')]) +@include('projects.partials.breadcrumb', ['title' => trans('job.create')])
@@ -11,24 +11,24 @@

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

- {!! FormField::text('name',['label'=> trans('job.name')]) !!} + {!! FormField::text('name', ['label' => trans('job.name')]) !!}
- {!! FormField::price('price', ['label'=> trans('job.price')]) !!} + {!! FormField::price('price', ['label' => trans('job.price'), 'currency' => Option::get('money_sign', 'Rp')]) !!}
- {!! FormField::select('worker_id', $workers, ['label'=> trans('job.worker'),'value' => 1]) !!} + {!! FormField::select('worker_id', $workers, ['label' => trans('job.worker'), 'value' => 1]) !!}
- {!! FormField::radios('type_id', [1 => 'Project','Tambahan'], ['value' => 1,'label'=> trans('job.type'),'list_style' => 'unstyled']) !!} + {!! FormField::radios('type_id', [1 => 'Project', 'Tambahan'], ['value' => 1, 'label' => trans('job.type'), 'list_style' => 'unstyled']) !!}
- {!! FormField::textarea('description',['label'=> trans('job.description')]) !!} + {!! FormField::textarea('description', ['label' => trans('job.description')]) !!}
- {!! Form::submit(trans('job.create'), ['class'=>'btn btn-primary']) !!} - {!! link_to_route('projects.jobs.index', trans('app.cancel'), [$project->id], ['class'=>'btn btn-default']) !!} + {!! Form::submit(trans('job.create'), ['class' => 'btn btn-primary']) !!} + {!! link_to_route('projects.jobs.index', trans('app.cancel'), [$project->id], ['class' => 'btn btn-default']) !!}
{!! Form::close() !!} diff --git a/resources/views/jobs/edit.blade.php b/resources/views/jobs/edit.blade.php index 93b92ce..b59f12a 100755 --- a/resources/views/jobs/edit.blade.php +++ b/resources/views/jobs/edit.blade.php @@ -5,31 +5,31 @@ @section('content')

- {!! Form::model($job, ['route'=>['jobs.update', $job->id], 'method' => 'patch']) !!} + {!! Form::model($job, ['route' =>['jobs.update', $job->id], 'method' => 'patch']) !!}

{{ $job->name }} {{ trans('job.edit') }}

- {!! FormField::text('name',['label'=> trans('job.name')]) !!} + {!! FormField::text('name', ['label' => trans('job.name')]) !!}
- {!! FormField::price('price', ['label'=> trans('job.price')]) !!} + {!! FormField::price('price', ['label' => trans('job.price'), 'currency' => Option::get('money_sign', 'Rp')]) !!}
- {!! FormField::select('worker_id', $workers, ['label'=> trans('job.worker')]) !!} + {!! FormField::select('worker_id', $workers, ['label' => trans('job.worker')]) !!}
- {!! FormField::radios('type_id', [1 => 'Project','Tambahan'], ['value' => 1,'label'=> trans('job.type'),'list_style' => 'unstyled']) !!} + {!! FormField::radios('type_id', [1 => 'Project', 'Tambahan'], ['value' => 1, 'label' => trans('job.type'), 'list_style' => 'unstyled']) !!}
- {!! FormField::textarea('description',['label'=> trans('job.description')]) !!} + {!! FormField::textarea('description', ['label' => trans('job.description')]) !!}
{!! Form::hidden('project_id', $job->project_id) !!} - {!! Form::submit(trans('job.update'), ['class'=>'btn btn-primary']) !!} + {!! Form::submit(trans('job.update'), ['class' => 'btn btn-primary']) !!} {!! link_to_route('jobs.show', trans('app.show'), [$job->id], ['class' => 'btn btn-info']) !!} {!! link_to_route('projects.jobs.index', trans('job.back_to_index'), [$job->project_id], ['class' => 'btn btn-default']) !!} - {!! link_to_route('jobs.delete', trans('job.delete'), [$job->id], ['class'=>'btn btn-danger pull-right']) !!} + {!! link_to_route('jobs.delete', trans('job.delete'), [$job->id], ['class' => 'btn btn-danger pull-right']) !!}
{!! Form::close() !!} diff --git a/resources/views/payments/create.blade.php b/resources/views/payments/create.blade.php index 9959006..b1c0bb2 100755 --- a/resources/views/payments/create.blade.php +++ b/resources/views/payments/create.blade.php @@ -28,7 +28,7 @@ {!! FormField::text('date', ['label'=> trans('payment.date')]) !!}
- {!! FormField::price('amount', ['label'=> trans('payment.amount')]) !!} + {!! FormField::price('amount', ['label'=> trans('payment.amount'), 'currency' => Option::get('money_sign', 'Rp')]) !!}
diff --git a/resources/views/payments/edit.blade.php b/resources/views/payments/edit.blade.php index fa3743a..73cea79 100755 --- a/resources/views/payments/edit.blade.php +++ b/resources/views/payments/edit.blade.php @@ -25,7 +25,7 @@ {!! FormField::text('date', ['label'=> trans('app.date')]) !!}
- {!! FormField::price('amount', ['label'=> trans('payment.amount')]) !!} + {!! FormField::price('amount', ['label'=> trans('payment.amount'), 'currency' => Option::get('money_sign', 'Rp')]) !!}
diff --git a/resources/views/projects/create.blade.php b/resources/views/projects/create.blade.php index 0984638..bea44e0 100755 --- a/resources/views/projects/create.blade.php +++ b/resources/views/projects/create.blade.php @@ -10,11 +10,11 @@
- {!! Form::open(['route'=>'projects.store']) !!} + {!! Form::open(['route' => 'projects.store']) !!}

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

- {!! FormField::text('name',['label'=> trans('project.name')]) !!} + {!! FormField::text('name', ['label' => trans('project.name')]) !!} {!! FormField::select('customer_id', $customers, ['placeholder' => 'Customer Baru']) !!}
@@ -26,18 +26,18 @@
- {!! FormField::text('proposal_date',['label'=> trans('project.proposal_date')]) !!} + {!! FormField::text('proposal_date', ['label' => trans('project.proposal_date')]) !!}
- {!! FormField::price('proposal_value', ['label'=> trans('project.proposal_value')]) !!} + {!! FormField::price('proposal_value', ['label' => trans('project.proposal_value'), 'currency' => Option::get('money_sign', 'Rp')]) !!}
- {!! FormField::textarea('description',['label'=> trans('project.description')]) !!} + {!! FormField::textarea('description', ['label' => trans('project.description')]) !!}
- {!! Form::submit(trans('project.create'), ['class'=>'btn btn-primary']) !!} - {!! link_to_route('projects.index', trans('app.cancel'), [], ['class'=>'btn btn-default']) !!} + {!! Form::submit(trans('project.create'), ['class' => 'btn btn-primary']) !!} + {!! link_to_route('projects.index', trans('app.cancel'), [], ['class' => 'btn btn-default']) !!}
diff --git a/resources/views/projects/edit.blade.php b/resources/views/projects/edit.blade.php index 11c852d..f1d57e7 100755 --- a/resources/views/projects/edit.blade.php +++ b/resources/views/projects/edit.blade.php @@ -4,33 +4,33 @@ @section('content') -@include('projects.partials.breadcrumb',['title' => trans('project.edit')]) +@include('projects.partials.breadcrumb', ['title' => trans('project.edit')])
- {!! Form::model($project, ['route'=>['projects.update', $project->id], 'method' => 'patch']) !!} + {!! Form::model($project, ['route' =>['projects.update', $project->id], 'method' => 'patch']) !!}

{{ $project->name }}

- {!! FormField::text('name',['label'=> trans('project.name')]) !!} - {!! FormField::textarea('description',['label'=> trans('project.description'),'rows' => 3]) !!} + {!! FormField::text('name', ['label' => trans('project.name')]) !!} + {!! FormField::textarea('description', ['label' => trans('project.description'),'rows' => 3]) !!}
- {!! FormField::text('proposal_date',['label'=> trans('project.proposal_date')]) !!} + {!! FormField::text('proposal_date', ['label' => trans('project.proposal_date')]) !!}
- {!! FormField::price('proposal_value', ['label'=> trans('project.proposal_value')]) !!} + {!! FormField::price('proposal_value', ['label' => trans('project.proposal_value'), 'currency' => Option::get('money_sign', 'Rp')]) !!}
- {!! FormField::text('start_date',['label'=> trans('project.start_date')]) !!} + {!! FormField::text('start_date', ['label' => trans('project.start_date')]) !!}
- {!! FormField::text('end_date',['label'=> trans('project.end_date')]) !!} + {!! FormField::text('end_date', ['label' => trans('project.end_date')]) !!}
- {!! FormField::price('project_value', ['label'=> trans('project.project_value')]) !!} + {!! FormField::price('project_value', ['label' => trans('project.project_value'), 'currency' => Option::get('money_sign', 'Rp')]) !!}
@@ -44,10 +44,10 @@
- {!! Form::submit(trans('project.update'), ['class'=>'btn btn-primary']) !!} + {!! Form::submit(trans('project.update'), ['class' =>'btn btn-primary']) !!} {!! link_to_route('projects.show', trans('app.show'), [$project->id], ['class' => 'btn btn-info']) !!} {!! link_to_route('projects.index', trans('project.back_to_index'), ['status' => $project->status_id], ['class' => 'btn btn-default']) !!} - {!! link_to_route('projects.delete', trans('app.delete'), [$project->id], ['class'=>'btn btn-danger pull-right']) !!} + {!! link_to_route('projects.delete', trans('app.delete'), [$project->id], ['class' =>'btn btn-danger pull-right']) !!}
{!! Form::close() !!} diff --git a/resources/views/projects/fees/create.blade.php b/resources/views/projects/fees/create.blade.php index 8fcfdbd..9b6a950 100644 --- a/resources/views/projects/fees/create.blade.php +++ b/resources/views/projects/fees/create.blade.php @@ -35,10 +35,10 @@ ) !!}
- {!! FormField::text('date',['label'=> trans('payment.date')]) !!} + {!! FormField::text('date', ['label' => trans('payment.date')]) !!}
- {!! FormField::price('amount', ['label'=> trans('payment.amount')]) !!} + {!! FormField::price('amount', ['label' => trans('payment.amount'), 'currency' => Option::get('money_sign', 'Rp')]) !!}
@@ -56,8 +56,8 @@
- {!! Form::submit(trans('payment.create'), ['class'=>'btn btn-primary']) !!} - {{ link_to_route('projects.payments', trans('app.cancel'), [$project->id], ['class'=>'btn btn-default']) }} + {!! Form::submit(trans('payment.create'), ['class' => 'btn btn-primary']) !!} + {{ link_to_route('projects.payments', trans('app.cancel'), [$project->id], ['class' => 'btn btn-default']) }}
{!! Form::close() !!} diff --git a/resources/views/projects/jobs/progress-export-html.blade.php b/resources/views/projects/jobs/progress-export-html.blade.php index fed5627..cb7aa38 100755 --- a/resources/views/projects/jobs/progress-export-html.blade.php +++ b/resources/views/projects/jobs/progress-export-html.blade.php @@ -26,12 +26,12 @@ {{ __('job.progress') }} {{ __('project.receiveable_earnings') }} - @foreach($jobs->sortByDesc('progress') as $key => $job) + @foreach($jobs as $key => $job) {{ 1 + $key }} {{ $job->name }} {{ formatRp($job->price) }} - {{ $job->progress }} % + {{ formatDecimal($job->progress) }} % {{ formatRp($job->receiveable_earning) }} @endforeach @@ -40,7 +40,7 @@ {{ __('app.total') }} {{ formatRp($jobs->sum('price')) }} - {{ formatDecimal($project->getJobOveralProgress()) }} % + {{ formatDecimal($project->getJobOveralProgress()) }} % {{ formatRp($jobs->sum('receiveable_earning')) }} diff --git a/resources/views/subscriptions/create.blade.php b/resources/views/subscriptions/create.blade.php index edfb857..304d101 100755 --- a/resources/views/subscriptions/create.blade.php +++ b/resources/views/subscriptions/create.blade.php @@ -11,7 +11,7 @@
- {!! Form::open(['route'=>'subscriptions.store']) !!} + {!! Form::open(['route' => 'subscriptions.store']) !!}

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

@@ -20,7 +20,7 @@ {!! FormField::text('name', ['label' => trans('subscription.name')]) !!}
- {!! FormField::price('price', ['label' => trans('subscription.price')]) !!} + {!! FormField::price('price', ['label' => trans('subscription.price'), 'currency' => Option::get('money_sign', 'Rp')]) !!}
@@ -38,8 +38,8 @@
- {!! Form::submit(trans('subscription.create'), ['class'=>'btn btn-primary']) !!} - {!! link_to_route('subscriptions.index', trans('app.cancel'), [], ['class'=>'btn btn-default']) !!} + {!! Form::submit(trans('subscription.create'), ['class' => 'btn btn-primary']) !!} + {!! link_to_route('subscriptions.index', trans('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 953ae29..ae04e9e 100755 --- a/resources/views/subscriptions/edit.blade.php +++ b/resources/views/subscriptions/edit.blade.php @@ -10,37 +10,37 @@ @if (request('action') == null)
- {!! Form::model($subscription, ['route'=>['subscriptions.update', $subscription->id], 'method' => 'patch']) !!} + {!! Form::model($subscription, ['route' => ['subscriptions.update', $subscription->id], 'method' => 'patch']) !!}

{{ $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('status_id', [trans('app.in_active'), trans('app.active')], ['label' => trans('app.status')]) !!}
- {!! FormField::text('name',['label' => trans('subscription.name')]) !!} + {!! FormField::text('name', ['label' => trans('subscription.name')]) !!}
- {!! FormField::price('price',['label' => trans('subscription.price')]) !!} + {!! FormField::price('price', ['label' => trans('subscription.price'), 'currency' => Option::get('money_sign', 'Rp')]) !!}
- {!! FormField::text('start_date',['label' => trans('subscription.start_date')]) !!} + {!! FormField::text('start_date', ['label' => trans('subscription.start_date')]) !!}
- {!! FormField::text('due_date',['label' => trans('subscription.due_date')]) !!} + {!! FormField::text('due_date', ['label' => trans('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' => trans('subscription.project')]) !!} + {!! FormField::select('vendor_id', $vendors, ['label' => trans('subscription.vendor')]) !!} + {!! FormField::textarea('notes', ['label' => trans('subscription.notes')]) !!}
- {!! Form::submit(trans('subscription.update'), ['class'=>'btn btn-primary']) !!} + {!! Form::submit(trans('subscription.update'), ['class' => 'btn btn-primary']) !!}
{!! Form::close() !!} @@ -49,7 +49,7 @@ @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']) !!}

+

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

@endif