From 234cd8d10bc9e2b5e219f480b585552ac232e9a5 Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Wed, 1 Nov 2017 22:55:49 +0800 Subject: [PATCH] Fix some payment views --- resources/lang/id/app.php | 39 ++++++++++++++++------------- resources/lang/id/contact.php | 3 ++- resources/lang/id/payment.php | 8 ++++-- resources/views/payments/pdf.blade.php | 26 +++++++++---------- resources/views/projects/payments.blade.php | 13 +++++++--- resources/views/users/agency/show.blade.php | 2 +- 6 files changed, 53 insertions(+), 38 deletions(-) diff --git a/resources/lang/id/app.php b/resources/lang/id/app.php index 1ee4017..24df63b 100644 --- a/resources/lang/id/app.php +++ b/resources/lang/id/app.php @@ -1,45 +1,50 @@ '#', - 'name' => 'Nama', + 'no' => 'Tidak', + 'label' => 'Label', + 'action' => 'Pilihan', + 'welcome' => 'Selamat Datang', + 'to' => 'Kepada', + 'from' => 'Dari', + 'active' => 'Aktif', + 'in_active' => 'Non Aktif', + 'show_detail_title' => 'Lihat detail :type :name', + 'active' => 'Status', + 'status' => 'Status', + 'total' => 'Total', + 'count' => 'Jumlah', + + // Action + 'add' => 'Tambah', 'submit' => 'Submit', 'update' => 'Simpan Perubahan', 'delete' => 'Hapus', - 'add' => 'Tambah', 'back' => 'Kembali', 'cancel' => 'Batal', 'reset' => 'Reset', - 'no' => 'Tidak', 'show' => 'Lihat Detail', - 'label' => 'Label', 'edit' => 'Edit', 'print' => 'Cetak', 'search' => 'Cari', 'filter' => 'Filter', 'pick' => 'Pilih', 'close' => 'Tutup', - 'action' => 'Pilihan', - 'notes' => 'Catatan', 'delete_confirm_button' => 'Ya, silakan hapus!', 'delete_confirm' => 'Anda yakin ingin menghapus?', + 'change_photo' => 'Ganti Foto', + + // Attributes + 'name' => 'Nama', + 'notes' => 'Catatan', 'description' => 'Deskripsi', 'code' => 'Kode', - 'active' => 'Status', - 'status' => 'Status', 'date' => 'Tanggal', 'time' => 'Jam', 'created_at' => 'Dibuat pada', 'created_by' => 'Oleh', - 'total' => 'Total', - 'count' => 'Jumlah', - 'photo' => 'Foto', 'start_date' => 'Tanggal Mulai', 'end_date' => 'Tanggal Selesai', - 'change_photo' => 'Ganti Foto', - 'welcome' => 'Selamat Datang', - 'to' => 'Kepada', - 'active' => 'Aktif', - 'in_active' => 'Non Aktif', - 'show_detail_title' => 'Lihat detail :type :name', ]; diff --git a/resources/lang/id/contact.php b/resources/lang/id/contact.php index 40cff73..44c8566 100644 --- a/resources/lang/id/contact.php +++ b/resources/lang/id/contact.php @@ -3,6 +3,7 @@ return [ 'contact' => 'Kontak', 'phone' => 'Telepon', + 'phone_abb' => 'Telp.', 'cellphone' => 'Telepon Selular', 'email' => 'Email', -]; \ No newline at end of file +]; diff --git a/resources/lang/id/payment.php b/resources/lang/id/payment.php index da0557d..7bba539 100644 --- a/resources/lang/id/payment.php +++ b/resources/lang/id/payment.php @@ -8,6 +8,10 @@ return [ 'not_found' => 'Pembayaran tidak ditemukan', 'empty' => 'Belum ada Pembayaran', 'back_to_index' => 'Kembali ke daftar Pembayaran', + 'receipt' => 'Bukti Pembayaran', + 'from' => 'Terima dari', + 'cash_amount' => 'Uang Sejumlah', + 'words_amount' => 'Terbilang', // Actions 'create' => 'Input Pembayaran Baru', @@ -23,7 +27,7 @@ return [ 'print' => 'Cetak Kuitansi', // Attrubutes - 'description' => 'Deskripsi', + 'description' => 'Untuk Pembayaran', 'date' => 'Tanggal Pembayaran', 'in_out' => 'Jenis Transaksi', 'type' => 'Jenis Pembayaran', @@ -33,4 +37,4 @@ return [ 'cash_in' => 'Pemasukan', 'cash_out' => 'Pengeluaran', 'payer' => 'Pembayar', -]; \ No newline at end of file +]; diff --git a/resources/views/payments/pdf.blade.php b/resources/views/payments/pdf.blade.php index a4a8f67..6f266de 100755 --- a/resources/views/payments/pdf.blade.php +++ b/resources/views/payments/pdf.blade.php @@ -27,34 +27,33 @@
-

JasaWebsiteBanjarmasin.com

+

{{ auth()->user()->agency->name }}

+ {{-- TODO: Agency tagline attribute --}}
Jasa Pembuatan Website dan Aplikasi Berbasis Web
- Jln. Pramuka, Gg. Mawar, Rt. 09, No. 60, Kel. Pemurus Luar
- Kec. Banjarmasin Timur, Kota Banjarmasin, - Kalsel - 70249,
- Telp. 0817 532 654 / 0823 5035 5470 + {!! nl2br(auth()->user()->agency->address) !!}
+ @lang('contact.phone_abb') {{ auth()->user()->agency->phone }}
-

Bukti Pembayaran

+

@lang('payment.receipt')

{{--

No. Invoice: __________

--}} - Terima Dari : - {{ $payment->customer->name }} + @lang('payment.from') : + {{ $payment->partner->name }} - Uang Sejumlah : + @lang('payment.cash_amount') : {{ ucwords(Terbilang::make($payment->amount)) }} Rupiah - Untuk Pembayaran : + @lang('payment.description') : {{ $payment->description }} @@ -63,20 +62,21 @@     + {{-- TODO: Agency city attribute --}} Banjarmasin, {{ dateId($payment->date) }} - Terbilang + @lang('payment.words_amount') {{ formatRp($payment->amount) }},- {{ auth()->user()->name }}, S. Kom.
- JasaWebsiteBanjarmasin.com + {{ auth()->user()->agency->name }} - \ No newline at end of file + diff --git a/resources/views/projects/payments.blade.php b/resources/views/projects/payments.blade.php index c1d1eb4..5a2c77b 100755 --- a/resources/views/projects/payments.blade.php +++ b/resources/views/projects/payments.blade.php @@ -26,9 +26,9 @@ {{ trans('app.table_no') }} {{ trans('app.date') }} {{ trans('payment.amount') }} - {{ $key == 1 ? 'Dari' : 'Ke' }} - {{ trans('payment.description') }} - {{ trans('app.action') }} + {{ $key == 1 ? trans('app.from') : trans('app.to') }} + {{ trans('payment.description') }} + {{ trans('app.action') }} @forelse($payments as $key => $payment) @@ -38,7 +38,12 @@ {{ formatRp($payment->amount) }} {{ $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' => 'Lihat ' . 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')]) !!} + @endif + @empty {{ trans('payment.empty') }} diff --git a/resources/views/users/agency/show.blade.php b/resources/views/users/agency/show.blade.php index 2088ae3..5b7ad08 100644 --- a/resources/views/users/agency/show.blade.php +++ b/resources/views/users/agency/show.blade.php @@ -13,7 +13,7 @@ {{ trans('agency.name') }}{{ $agency->name }} {{ trans('agency.email') }}{{ $agency->email }} {{ trans('agency.phone') }}{{ $agency->phone }} - {{ trans('agency.address') }}{{ $agency->address }} + {{ trans('agency.address') }}{!! nl2br($agency->address) !!} {{ trans('agency.website') }}{{ $agency->website }}