Update money sign on price form fields

Fixed some code styles on views
Update job progress html export page

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',

resources/views/invoice-drafts/partials/draft-item-list.blade.php

@@ -31,7 +31,12 @@
                 <td class="col-md-3">
                     {!! 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']) }}
                 </td>
@@ -59,7 +64,12 @@
                 <td colspan="2">
                     {!! 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']) }}
                 </td>

resources/views/invoices/partials/item-list.blade.php

@@ -31,7 +31,12 @@
                 <td class="col-md-3">
                     {!! 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']) }}
                 </td>
@@ -59,7 +64,12 @@
                 <td colspan="2">
                     {!! 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']) }}
                 </td>

resources/views/jobs/create.blade.php

@@ -14,7 +14,7 @@
                 {!! FormField::text('name', ['label' => trans('job.name')]) !!}
                 <div class="row">
                     <div class="col-sm-4">
-                        {!! FormField::price('price', ['label'=> trans('job.price')]) !!}
+                        {!! FormField::price('price', ['label' => trans('job.price'), 'currency' => Option::get('money_sign', 'Rp')]) !!}
                     </div>
                     <div class="col-sm-4">
                         {!! FormField::select('worker_id', $workers, ['label' => trans('job.worker'), 'value' => 1]) !!}

resources/views/jobs/edit.blade.php

@@ -12,7 +12,7 @@
                 {!! FormField::text('name', ['label' => trans('job.name')]) !!}
                 <div class="row">
                     <div class="col-sm-4">
-                        {!! FormField::price('price', ['label'=> trans('job.price')]) !!}
+                        {!! FormField::price('price', ['label' => trans('job.price'), 'currency' => Option::get('money_sign', 'Rp')]) !!}
                     </div>
                     <div class="col-sm-4">
                         {!! FormField::select('worker_id', $workers, ['label' => trans('job.worker')]) !!}

resources/views/payments/create.blade.php

@@ -28,7 +28,7 @@
                         {!! FormField::text('date', ['label'=> trans('payment.date')]) !!}
                     </div>
                     <div class="col-md-6">
-                        {!! FormField::price('amount', ['label'=> trans('payment.amount')]) !!}
+                        {!! FormField::price('amount', ['label'=> trans('payment.amount'), 'currency' => Option::get('money_sign', 'Rp')]) !!}
                     </div>
                 </div>
                 <div class="row">

resources/views/payments/edit.blade.php

@@ -25,7 +25,7 @@
                         {!! FormField::text('date', ['label'=> trans('app.date')]) !!}
                     </div>
                     <div class="col-md-6">
-                        {!! FormField::price('amount', ['label'=> trans('payment.amount')]) !!}
+                        {!! FormField::price('amount', ['label'=> trans('payment.amount'), 'currency' => Option::get('money_sign', 'Rp')]) !!}
                     </div>
                 </div>
                 <div class="row">

resources/views/projects/create.blade.php

@@ -29,7 +29,7 @@
                         {!! FormField::text('proposal_date', ['label' => trans('project.proposal_date')]) !!}
                     </div>
                     <div class="col-md-6">
-                        {!! FormField::price('proposal_value', ['label'=> trans('project.proposal_value')]) !!}
+                        {!! FormField::price('proposal_value', ['label' => trans('project.proposal_value'), 'currency' => Option::get('money_sign', 'Rp')]) !!}
                     </div>
                 </div>
                 {!! FormField::textarea('description', ['label' => trans('project.description')]) !!}

resources/views/projects/edit.blade.php

@@ -19,7 +19,7 @@
                         {!! FormField::text('proposal_date', ['label' => trans('project.proposal_date')]) !!}
                     </div>
                     <div class="col-md-6">
-                        {!! FormField::price('proposal_value', ['label'=> trans('project.proposal_value')]) !!}
+                        {!! FormField::price('proposal_value', ['label' => trans('project.proposal_value'), 'currency' => Option::get('money_sign', 'Rp')]) !!}
                     </div>
                 </div>
                 <div class="row">
@@ -30,7 +30,7 @@
                         {!! FormField::text('end_date', ['label' => trans('project.end_date')]) !!}
                     </div>
                     <div class="col-md-6">
-                        {!! FormField::price('project_value', ['label'=> trans('project.project_value')]) !!}
+                        {!! FormField::price('project_value', ['label' => trans('project.project_value'), 'currency' => Option::get('money_sign', 'Rp')]) !!}
                     </div>
                 </div>
                 <div class="row">

resources/views/projects/fees/create.blade.php

@@ -38,7 +38,7 @@
                         {!! FormField::text('date', ['label' => trans('payment.date')]) !!}
                     </div>
                     <div class="col-md-4">
-                        {!! FormField::price('amount', ['label'=> trans('payment.amount')]) !!}
+                        {!! FormField::price('amount', ['label' => trans('payment.amount'), 'currency' => Option::get('money_sign', 'Rp')]) !!}
                     </div>
                 </div>
                 <div class="row">

resources/views/projects/jobs/progress-export-html.blade.php

@@ -26,12 +26,12 @@
                     <th class="text-center">{{ __('job.progress') }}</th>
                     <th class="text-center">{{ __('project.receiveable_earnings') }}</th>
                 </tr>
-                @foreach($jobs->sortByDesc('progress') as $key => $job)
+                @foreach($jobs as $key => $job)
                 <tr>
                     <td class="text-center">{{ 1 + $key }}</td>
                     <td>{{ $job->name }}</td>
                     <td class="text-right">{{ formatRp($job->price) }}</td>
-                    <td class="text-center">{{ $job->progress }} %</td>
+                    <td class="text-right">{{ formatDecimal($job->progress) }} %</td>
                     <td class="text-right">{{ formatRp($job->receiveable_earning) }}</td>
                 </tr>
                 @endforeach
@@ -40,7 +40,7 @@
                 <tr>
                     <th class="text-right" colspan="2">{{ __('app.total') }}</th>
                     <th class="text-right">{{ formatRp($jobs->sum('price')) }}</th>
-                    <th class="text-center">{{ formatDecimal($project->getJobOveralProgress()) }} %</th>
+                    <th class="text-right">{{ formatDecimal($project->getJobOveralProgress()) }} %</th>
                     <th class="text-right">{{ formatRp($jobs->sum('receiveable_earning')) }}</th>
                 </tr>
             </tfoot>

resources/views/subscriptions/create.blade.php

@@ -20,7 +20,7 @@
                         {!! FormField::text('name', ['label' => trans('subscription.name')]) !!}
                     </div>
                     <div class="col-sm-6">
-                        {!! FormField::price('price', ['label' => trans('subscription.price')]) !!}
+                        {!! FormField::price('price', ['label' => trans('subscription.price'), 'currency' => Option::get('money_sign', 'Rp')]) !!}
                     </div>
                 </div>
                 <div class="row">

resources/views/subscriptions/edit.blade.php

@@ -23,7 +23,7 @@
                         {!! FormField::text('name', ['label' => trans('subscription.name')]) !!}
                     </div>
                     <div class="col-sm-6">
-                        {!! FormField::price('price',['label' => trans('subscription.price')]) !!}
+                        {!! FormField::price('price', ['label' => trans('subscription.price'), 'currency' => Option::get('money_sign', 'Rp')]) !!}
                     </div>
                 </div>
                 <div class="row">