diff --git a/app/Entities/Projects/Job.php b/app/Entities/Projects/Job.php index 276009a..51941df 100755 --- a/app/Entities/Projects/Job.php +++ b/app/Entities/Projects/Job.php @@ -45,7 +45,7 @@ class Job extends Model public function type() { - return $this->type_id == 1 ? 'Project' : 'Additional'; + return $this->type_id == 1 ? trans('job.main') : trans('job.additional'); } public function getProgressAttribute() diff --git a/resources/lang/en/job.php b/resources/lang/en/job.php index 09416bd..5312984 100644 --- a/resources/lang/en/job.php +++ b/resources/lang/en/job.php @@ -4,7 +4,6 @@ return [ // Labels 'job' => 'Job', 'list' => 'Job List', - 'additional' => 'Additional Job List', 'on_progress' => 'Job on Progress', 'detail' => 'Job Detail', 'search' => 'Ssearch Job', @@ -36,4 +35,8 @@ return [ 'worker' => 'Worker', 'price' => 'Price', 'type' => 'Job Type', + + // Types + 'main' => 'Main', + 'additional' => 'Additional', ]; diff --git a/resources/lang/en/project.php b/resources/lang/en/project.php index dd2fbf3..cd9149a 100644 --- a/resources/lang/en/project.php +++ b/resources/lang/en/project.php @@ -18,6 +18,7 @@ return [ 'receiveable_earnings' => 'Receiveable Earning', 'payment_remaining' => 'Payment Remaining', 'earnings_calculation' => 'Earnings Calculation', + 'additional_jobs' => 'Additional Job List', // Payments 'payment_summary' => 'Payment Summary', diff --git a/resources/lang/id/job.php b/resources/lang/id/job.php index fa5a8a3..4973285 100644 --- a/resources/lang/id/job.php +++ b/resources/lang/id/job.php @@ -4,7 +4,6 @@ return [ // Labels 'job' => 'Job', 'list' => 'Daftar Job', - 'additional' => 'Daftar Job Tambahan', 'on_progress' => 'Job on Progress', 'detail' => 'Detail Job', 'search' => 'Cari Job', @@ -36,4 +35,8 @@ return [ 'worker' => 'Pekerja', 'price' => 'Biaya Pengerjaan', 'type' => 'Jenis Job', + + // Types + 'main' => 'Utama', + 'additional' => 'Tambahan', ]; diff --git a/resources/lang/id/project.php b/resources/lang/id/project.php index 94f056c..f4cff97 100644 --- a/resources/lang/id/project.php +++ b/resources/lang/id/project.php @@ -18,6 +18,7 @@ return [ 'receiveable_earnings' => 'Pendapatan', 'payment_remaining' => 'Sisa', 'earnings_calculation' => 'Rumus Pendapatan', + 'additional_jobs' => 'Daftar Job Tambahan', // Payments 'payment_summary' => 'Summary Pembayaran', diff --git a/resources/views/jobs/create.blade.php b/resources/views/jobs/create.blade.php index bb63939..919a641 100755 --- a/resources/views/jobs/create.blade.php +++ b/resources/views/jobs/create.blade.php @@ -20,7 +20,7 @@ {!! 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 => trans('job.main'), trans('job.additional')], ['value' => 1, 'label' => trans('job.type'), 'list_style' => 'unstyled']) !!}
{!! FormField::textarea('description', ['label' => trans('job.description')]) !!} diff --git a/resources/views/jobs/edit.blade.php b/resources/views/jobs/edit.blade.php index b59f12a..71b3d2b 100755 --- a/resources/views/jobs/edit.blade.php +++ b/resources/views/jobs/edit.blade.php @@ -18,7 +18,7 @@ {!! 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 => trans('job.main'), trans('job.additional')], ['value' => 1, 'label' => trans('job.type'), 'list_style' => 'unstyled']) !!}
{!! FormField::textarea('description', ['label' => trans('job.description')]) !!} diff --git a/resources/views/projects/jobs/index.blade.php b/resources/views/projects/jobs/index.blade.php index 98bea83..2f4ab82 100755 --- a/resources/views/projects/jobs/index.blade.php +++ b/resources/views/projects/jobs/index.blade.php @@ -29,7 +29,7 @@ @endif

- {{ $key == 1 ? trans('job.list') : trans('job.additional') }} + {{ $key == 1 ? trans('project.jobs') : trans('project.additional_jobs') }}