diff --git a/resources/lang/de/project.php b/resources/lang/de/project.php index 349056a..de47cfd 100644 --- a/resources/lang/de/project.php +++ b/resources/lang/de/project.php @@ -21,6 +21,7 @@ return [ 'additional_jobs' => 'Zusätzliche Beschäftigungsliste', // Payments + 'view_payments' => 'View All Project Payments', 'payment_summary' => 'Zahlungssumme', 'payment_status' => 'Zahlungsstatus', 'payment_statuses' => [ diff --git a/resources/lang/en/project.php b/resources/lang/en/project.php index cd9149a..cb1c18c 100644 --- a/resources/lang/en/project.php +++ b/resources/lang/en/project.php @@ -21,6 +21,7 @@ return [ 'additional_jobs' => 'Additional Job List', // Payments + 'view_payments' => 'View All Project Payments', 'payment_summary' => 'Payment Summary', 'payment_status' => 'Payment Status', 'payment_statuses' => [ diff --git a/resources/lang/id/project.php b/resources/lang/id/project.php index f4cff97..802b912 100644 --- a/resources/lang/id/project.php +++ b/resources/lang/id/project.php @@ -21,6 +21,7 @@ return [ 'additional_jobs' => 'Daftar Job Tambahan', // Payments + 'view_payments' => 'Lihat Semua Pembayaran Project', 'payment_summary' => 'Summary Pembayaran', 'payment_status' => 'Status', 'payment_statuses' => [ diff --git a/resources/views/customers/payments.blade.php b/resources/views/customers/payments.blade.php index 9b0afca..a62ab7f 100755 --- a/resources/views/customers/payments.blade.php +++ b/resources/views/customers/payments.blade.php @@ -23,7 +23,7 @@ 'projects.payments', $payment->project->name, [$payment->project_id], - ['title' => 'Lihat seluruh Pembayaran Project ini'] + ['title' => __('project.view_payments')] ) }} {{ $payment->type() }} diff --git a/resources/views/payments/index.blade.php b/resources/views/payments/index.blade.php index 7672971..77a245a 100755 --- a/resources/views/payments/index.blade.php +++ b/resources/views/payments/index.blade.php @@ -38,7 +38,7 @@ 'projects.payments', $payment->project->name, [$payment->project_id], - ['title' => 'Lihat seluruh Pembayaran Project ini'] + ['title' => __('project.view_payments')] ) }}
{{ $payment->type() }} diff --git a/resources/views/payments/show.blade.php b/resources/views/payments/show.blade.php index d019d3c..a344d78 100755 --- a/resources/views/payments/show.blade.php +++ b/resources/views/payments/show.blade.php @@ -15,8 +15,8 @@ @lang('app.action')

{!! link_to_route('payments.pdf', trans('payment.print'), [$payment->id], ['class' => 'btn btn-success']) !!}

{!! 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']) !!}

-

{!! link_to_route('payments.index', 'Lihat Semua Pembayaran', [], ['class' => 'btn btn-default']) !!}

+

{!! link_to_route('projects.payments', __('project.view_payments'), [$payment->project_id], ['class' => 'btn btn-default']) !!}

+

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

@endsection diff --git a/resources/views/projects/index.blade.php b/resources/views/projects/index.blade.php index 9a89214..23726f1 100755 --- a/resources/views/projects/index.blade.php +++ b/resources/views/projects/index.blade.php @@ -15,7 +15,7 @@ {!! FormField::select('status_id', ProjectStatus::toArray(), ['value' => $statusId, 'placeholder' => trans('project.all')]) !!} {!! Form::text('q', Request::get('q'), ['class' => 'form-control index-search-field', 'placeholder' => trans('project.search'), 'style' => 'width:100%;max-width:350px']) !!} {!! Form::submit(trans('project.search'), ['class' => 'btn btn-info btn-sm']) !!} - {!! link_to_route('projects.index', 'Reset', [], ['class' => 'btn btn-default btn-sm']) !!} + {!! link_to_route('projects.index', __('app.reset'), [], ['class' => 'btn btn-default btn-sm']) !!} {!! Form::close() !!}
diff --git a/resources/views/projects/jobs/index.blade.php b/resources/views/projects/jobs/index.blade.php index 226d2ee..6425df3 100755 --- a/resources/views/projects/jobs/index.blade.php +++ b/resources/views/projects/jobs/index.blade.php @@ -88,7 +88,7 @@ {{-- {{ $job->worker->name }} --}} @can('view', $job) - {!! html_link_to_route('jobs.show', '',[$job->id],['icon' => 'search', 'title' => 'Lihat ' . trans('job.show'), 'class' => 'btn btn-info btn-xs','id' => 'show-job-' . $job->id]) !!} + {!! html_link_to_route('jobs.show', '',[$job->id],['icon' => 'search', 'title' => __('job.show'), 'class' => 'btn btn-info btn-xs','id' => 'show-job-' . $job->id]) !!} @endcan @can('edit', $job) {!! html_link_to_route('jobs.edit', '',[$job->id],['icon' => 'edit', 'title' => trans('job.edit'), 'class' => 'btn btn-warning btn-xs']) !!} diff --git a/resources/views/projects/payments.blade.php b/resources/views/projects/payments.blade.php index 2bee87a..923162e 100755 --- a/resources/views/projects/payments.blade.php +++ b/resources/views/projects/payments.blade.php @@ -7,8 +7,8 @@

- {!! html_link_to_route('payments.create', trans('payment.create'), ['project_id' => $project->id,'customer_id' => $project->customer_id], ['class' => 'btn btn-success','icon' => 'plus']) !!} - {!! html_link_to_route('projects.fees.create', trans('payment.create_fee'), ['project_id' => $project->id], ['class' => 'btn btn-default','icon' => 'plus']) !!} + {!! html_link_to_route('payments.create', trans('payment.create'), ['project_id' => $project->id, 'customer_id' => $project->customer_id], ['class' => 'btn btn-success', 'icon' => 'plus']) !!} + {!! html_link_to_route('projects.fees.create', trans('payment.create_fee'), ['project_id' => $project->id], ['class' => 'btn btn-default', 'icon' => 'plus']) !!}
{{ $project->name }} {{ trans('project.payments') }}

@@ -40,9 +40,9 @@ {{ $payment->partner->name }} {{ $payment->description }} [{{ $payment->type() }}] - {!! html_link_to_route('payments.show','',[$payment->id],['class' => 'btn btn-info btn-xs','icon' => 'search','title' => 'Lihat ' . trans('payment.show')]) !!} + {!! html_link_to_route('payments.show', '',[$payment->id],['class' => 'btn btn-info btn-xs', 'icon' => 'search', 'title' => trans('payment.show')]) !!} @if ($payment->in_out == 1) - {!! html_link_to_route('payments.pdf','',[$payment->id],['class' => 'btn btn-success btn-xs','icon' => 'print','title' => trans('payment.print')]) !!} + {!! html_link_to_route('payments.pdf', '',[$payment->id],['class' => 'btn btn-success btn-xs', 'icon' => 'print', 'title' => trans('payment.print')]) !!} @endif diff --git a/resources/views/reports/current-credits.blade.php b/resources/views/reports/current-credits.blade.php index 520a688..b5bf46b 100644 --- a/resources/views/reports/current-credits.blade.php +++ b/resources/views/reports/current-credits.blade.php @@ -22,7 +22,7 @@ @forelse($projects as $key => $project) {{ 1 + $key }} - {!! link_to_route('projects.payments',$project->name,[$project->id],['title' => 'Lihat Daftar Pembayaran','target' => '_blank']) !!} + {!! link_to_route('projects.payments', $project->name, [$project->id], ['title' => __('project.view_payments'), 'target' => '_blank']) !!} {{ formatRp($project->project_value) }} {{ formatRp($project->cashInTotal()) }} {{ formatRp($project->balance = $project->project_value - $project->cashInTotal()) }} @@ -35,9 +35,9 @@ - Jumlah + {{ __('app.total') }} {{ formatRp($projects->sum('balance')) }} - +