From 16be246496b6cd7d015a58f48cd0c232c67c187f Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Thu, 11 Jan 2018 21:54:50 +0800 Subject: [PATCH] Fix some missing lang item on project payments --- resources/lang/en/payment.php | 6 ++++-- resources/lang/en/project.php | 8 ++++++++ resources/lang/id/payment.php | 4 +++- resources/lang/id/project.php | 8 ++++++++ resources/views/payments/create.blade.php | 12 ++++++------ resources/views/payments/edit.blade.php | 12 ++++++------ resources/views/projects/payments.blade.php | 6 +++--- 7 files changed, 38 insertions(+), 18 deletions(-) diff --git a/resources/lang/en/payment.php b/resources/lang/en/payment.php index 4dac411..fc6be37 100644 --- a/resources/lang/en/payment.php +++ b/resources/lang/en/payment.php @@ -29,11 +29,13 @@ return [ 'search' => 'Search Project Payment', 'print' => 'Print Receipt', - // Attrubutes + // Attributes 'id' => 'Payment ID', - 'description' => 'description', + 'description' => 'Description', 'date' => 'Payment Date', 'in_out' => 'Transaction Type', + 'in' => 'Cash in', + 'out' => 'Cash out', 'type' => 'Payment Type', 'project' => 'Project', 'customer' => 'Customer', diff --git a/resources/lang/en/project.php b/resources/lang/en/project.php index 7f396c0..dd2fbf3 100644 --- a/resources/lang/en/project.php +++ b/resources/lang/en/project.php @@ -19,6 +19,14 @@ return [ 'payment_remaining' => 'Payment Remaining', 'earnings_calculation' => 'Earnings Calculation', + // Payments + 'payment_summary' => 'Payment Summary', + 'payment_status' => 'Payment Status', + 'payment_statuses' => [ + 'paid' => 'Paid', + 'outstanding' => 'Outstanding', + ], + // Actions 'create' => 'Create new Project', 'created' => 'New Project has been created.', diff --git a/resources/lang/id/payment.php b/resources/lang/id/payment.php index 9f6a935..e25c54c 100644 --- a/resources/lang/id/payment.php +++ b/resources/lang/id/payment.php @@ -29,11 +29,13 @@ return [ 'search' => 'Cari Pembayaran Project', 'print' => 'Cetak Kuitansi', - // Attrubutes + // Attributes 'id' => 'ID Pembayaran', 'description' => 'Untuk Pembayaran', 'date' => 'Tanggal Pembayaran', 'in_out' => 'Jenis Transaksi', + 'in' => 'Pemasukan', + 'out' => 'Pengeluaran', 'type' => 'Jenis Pembayaran', 'project' => 'Project', 'customer' => 'Dari/Kepada', diff --git a/resources/lang/id/project.php b/resources/lang/id/project.php index e447e3f..94f056c 100644 --- a/resources/lang/id/project.php +++ b/resources/lang/id/project.php @@ -19,6 +19,14 @@ return [ 'payment_remaining' => 'Sisa', 'earnings_calculation' => 'Rumus Pendapatan', + // Payments + 'payment_summary' => 'Summary Pembayaran', + 'payment_status' => 'Status', + 'payment_statuses' => [ + 'paid' => 'Lunas', + 'outstanding' => 'Belum Lunas', + ], + // Actions 'create' => 'Input Project Baru', 'created' => 'Input Project baru telah berhasil.', diff --git a/resources/views/payments/create.blade.php b/resources/views/payments/create.blade.php index 34a8d83..9959006 100755 --- a/resources/views/payments/create.blade.php +++ b/resources/views/payments/create.blade.php @@ -17,15 +17,15 @@
- {!! FormField::radios('in_out',['Pengeluaran', 'Pemasukan'],['label' => trans('payment.in_out'),'value' => 1]) !!} + {!! FormField::radios('in_out', [trans('payment.out'), trans('payment.in')], ['label' => trans('payment.in_out'), 'value' => 1]) !!}
- {!! FormField::radios('type_id', PaymentType::toArray(), ['label'=> trans('payment.type'),'value' => 1,'list_style' => 'unstyled']) !!} + {!! FormField::radios('type_id', PaymentType::toArray(), ['label'=> trans('payment.type'), 'value' => 1, 'list_style' => 'unstyled']) !!}
- {!! FormField::text('date',['label'=> trans('payment.date')]) !!} + {!! FormField::text('date', ['label'=> trans('payment.date')]) !!}
{!! FormField::price('amount', ['label'=> trans('payment.amount')]) !!} @@ -33,13 +33,13 @@
- {!! FormField::select('project_id', $projects, ['label'=> trans('payment.project'),'value' => Request::get('project_id')]) !!} + {!! FormField::select('project_id', $projects, ['label'=> trans('payment.project'), 'value' => Request::get('project_id')]) !!}
- {!! FormField::select('partner_id', $partners, ['label'=> trans('payment.customer'),'value' => Request::get('customer_id')]) !!} + {!! FormField::select('partner_id', $partners, ['label'=> trans('payment.customer'), 'value' => Request::get('customer_id')]) !!}
- {!! FormField::textarea('description',['label'=> trans('payment.description'),'rows' => 3]) !!} + {!! FormField::textarea('description', ['label'=> trans('payment.description'), 'rows' => 3]) !!}
diff --git a/resources/views/payments/edit.blade.php b/resources/views/payments/edit.blade.php index db0b866..fa3743a 100755 --- a/resources/views/payments/edit.blade.php +++ b/resources/views/payments/edit.blade.php @@ -4,7 +4,7 @@ @section('content') -@include('payments.partials.breadcrumb',['title' => trans('payment.edit')]) +@include('payments.partials.breadcrumb', ['title' => trans('payment.edit')])
@@ -14,18 +14,18 @@
- {!! FormField::radios('in_out',['Pengeluaran','Pemasukan'],['label'=> trans('payment.in_out'),'value' => 1]) !!} + {!! FormField::radios('in_out', [trans('payment.out'), trans('payment.in')], ['label'=> trans('payment.in_out'), 'value' => 1]) !!}
- {!! FormField::radios('type_id', PaymentType::toArray(), ['label'=> trans('payment.type'),'value' => 1,'list_style' => 'unstyled']) !!} + {!! FormField::radios('type_id', PaymentType::toArray(), ['label' => trans('payment.type'), 'value' => 1, 'list_style' => 'unstyled']) !!}
- {!! FormField::text('date',['label'=> trans('app.date')]) !!} + {!! FormField::text('date', ['label'=> trans('app.date')]) !!}
- {!! FormField::price('amount',['label'=> trans('payment.amount')]) !!} + {!! FormField::price('amount', ['label'=> trans('payment.amount')]) !!}
@@ -36,7 +36,7 @@ {!! FormField::select('partner_id', $partners, ['label'=> trans('payment.customer')]) !!}
- {!! FormField::textarea('description',['label'=> trans('payment.description')]) !!} + {!! FormField::textarea('description', ['label'=> trans('payment.description')]) !!}
diff --git a/resources/views/projects/payments.blade.php b/resources/views/projects/payments.blade.php index 8d4e789..6fed091 100755 --- a/resources/views/projects/payments.blade.php +++ b/resources/views/projects/payments.blade.php @@ -66,11 +66,11 @@

Summary

- + - - + +
{{ trans('project.project_value') }}{{ formatRp($project->project_value) }}
{{ trans('project.project_value') }}{{ formatRp($project->project_value) }}
{{ trans('project.cash_in_total') }}{{ formatRp($project->cashInTotal()) }}
{{ trans('project.cash_out_total') }}{{ formatRp($project->cashOutTotal()) }}
Sisa{{ formatRp($balance = $project->project_value - $project->cashInTotal()) }}
{{ trans('app.status') }}{{ $balance > 0 ? 'Belum Lunas' : 'Lunas' }}
{{ trans('project.payment_remaining') }}{{ formatRp($balance = $project->project_value - $project->cashInTotal()) }}
{{ trans('project.payment_status') }}{{ $balance > 0 ? trans('project.payment_statuses.outstanding') : trans('project.payment_statuses.paid') }}