diff --git a/app/helpers.php b/app/helpers.php
index af0f591..cb40161 100755
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -37,7 +37,7 @@ function formatRp($number)
* @param int|string $number
* @return string
*/
-function formatDecimal($number)
+function format_decimal($number)
{
return number_format($number, 2, ',', '.');
}
diff --git a/resources/views/jobs/partials/job-show.blade.php b/resources/views/jobs/partials/job-show.blade.php
index 36b993c..3574e19 100644
--- a/resources/views/jobs/partials/job-show.blade.php
+++ b/resources/views/jobs/partials/job-show.blade.php
@@ -7,7 +7,7 @@
@can('see-pricings', $job)
| {{ __('job.price') }} | {{ formatRp($job->price) }} |
@endcan
- | {{ __('job.progress') }} | {{ formatDecimal($job->progress) }}% |
+ | {{ __('job.progress') }} | {{ format_decimal($job->progress) }}% |
| {{ __('job.worker') }} | {{ $job->worker->name }} |
| {{ __('time.updated_at') }} | {{ $job->updated_at }} |
| {{ __('job.description') }} | {!! nl2br($job->description) !!} |
diff --git a/resources/views/jobs/partials/job-tasks.blade.php b/resources/views/jobs/partials/job-tasks.blade.php
index ea906d0..20fe1d1 100644
--- a/resources/views/jobs/partials/job-tasks.blade.php
+++ b/resources/views/jobs/partials/job-tasks.blade.php
@@ -66,7 +66,7 @@
| {{ __('app.total') }} |
- {{ formatDecimal($job->tasks->avg('progress')) }} % |
+ {{ format_decimal($job->tasks->avg('progress')) }} % |
@if (request('action') == 'sort_tasks')
{{ link_to_route('jobs.show', __('app.done'), [$job], ['class' => 'btn btn-default btn-xs pull-right']) }}
diff --git a/resources/views/jobs/unfinished.blade.php b/resources/views/jobs/unfinished.blade.php
index 74dfcae..1f4d86f 100755
--- a/resources/views/jobs/unfinished.blade.php
+++ b/resources/views/jobs/unfinished.blade.php
@@ -46,7 +46,7 @@
@endif
| {{ $job->tasks_count = $job->tasks->count() }} |
- {{ formatDecimal($job->progress) }} % |
+ {{ format_decimal($job->progress) }} % |
@can('see-pricings', $job)
{{ formatRp($job->price) }} |
@endcan
@@ -63,7 +63,7 @@
| {{ __('app.total') }} |
{{ $jobs->sum('tasks_count') }} |
- {{ formatDecimal($jobs->avg('progress')) }} % |
+ {{ format_decimal($jobs->avg('progress')) }} % |
@can('see-pricings', new App\Entities\Projects\Job)
{{ formatRp($jobs->sum('price')) }} |
@endcan
diff --git a/resources/views/projects/index.blade.php b/resources/views/projects/index.blade.php
index f5027bd..7b7aa6a 100755
--- a/resources/views/projects/index.blade.php
+++ b/resources/views/projects/index.blade.php
@@ -44,7 +44,7 @@
{{ $project->start_date }} |
{{ $project->work_duration }} |
@if (request('status_id') == 2)
- {{ formatDecimal($project->getJobOveralProgress()) }} % |
+ {{ format_decimal($project->getJobOveralProgress()) }} % |
{{ $project->due_date }} |
@endif
@can('see-pricings', new App\Entities\Projects\Project)
diff --git a/resources/views/projects/jobs/index.blade.php b/resources/views/projects/jobs/index.blade.php
index 9435629..0b724b6 100755
--- a/resources/views/projects/jobs/index.blade.php
+++ b/resources/views/projects/jobs/index.blade.php
@@ -82,7 +82,7 @@
@endif
{{ $job->tasks_count = $job->tasks->count() }} |
- {{ formatDecimal($job->progress) }} % |
+ {{ format_decimal($job->progress) }} % |
@can('see-pricings', $job)
{{ formatRp($job->price) }} |
@endcan
@@ -108,8 +108,8 @@
Total |
{{ $groupedJobs->sum('tasks_count') }} |
- {{ formatDecimal($groupedJobs->sum('progress') / $groupedJobs->count()) }} %
- ({{ formatDecimal($project->getJobOveralProgress()) }} %)
+ {{ format_decimal($groupedJobs->sum('progress') / $groupedJobs->count()) }} %
+ ({{ format_decimal($project->getJobOveralProgress()) }} %)
|
@can('see-pricings', new App\Entities\Projects\Job)
{{ formatRp($groupedJobs->sum('price')) }} |
diff --git a/resources/views/projects/jobs/progress-export-html.blade.php b/resources/views/projects/jobs/progress-export-html.blade.php
index cb7aa38..f1c78fa 100755
--- a/resources/views/projects/jobs/progress-export-html.blade.php
+++ b/resources/views/projects/jobs/progress-export-html.blade.php
@@ -31,7 +31,7 @@
{{ 1 + $key }} |
{{ $job->name }} |
{{ formatRp($job->price) }} |
- {{ formatDecimal($job->progress) }} % |
+ {{ format_decimal($job->progress) }} % |
{{ formatRp($job->receiveable_earning) }} |
@endforeach
@@ -40,7 +40,7 @@
| {{ __('app.total') }} |
{{ formatRp($jobs->sum('price')) }} |
- {{ formatDecimal($project->getJobOveralProgress()) }} % |
+ {{ format_decimal($project->getJobOveralProgress()) }} % |
{{ formatRp($jobs->sum('receiveable_earning')) }} |
diff --git a/resources/views/projects/partials/project-stats.blade.php b/resources/views/projects/partials/project-stats.blade.php
index 16a52b3..75194b6 100644
--- a/resources/views/projects/partials/project-stats.blade.php
+++ b/resources/views/projects/partials/project-stats.blade.php
@@ -6,7 +6,7 @@
-
{{ formatDecimal($project->getJobOveralProgress()) }} %
+
{{ format_decimal($project->getJobOveralProgress()) }} %
{{ __('project.overall_progress') }}
diff --git a/resources/views/users/jobs.blade.php b/resources/views/users/jobs.blade.php
index 6a2f113..e61b9e2 100755
--- a/resources/views/users/jobs.blade.php
+++ b/resources/views/users/jobs.blade.php
@@ -33,7 +33,7 @@
@endif
{{ $job->tasks_count = $job->tasks->count() }} |
- {{ formatDecimal($job->progress = $job->progress) }} % |
+ {{ format_decimal($job->progress = $job->progress) }} % |
{{ formatRp($job->price) }} |
{!! html_link_to_route('jobs.show', '', [$job], [
|