Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00
Code Issues Releases Activity

Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop

Browse Source
This commit is contained in:
Hillel Coren 2016-06-30 16:47:42 +03:00
commit 274a89a96e
6 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/ClientPortalController.php
View File

@ -372,7 +372,7 @@ class ClientPortalController extends BaseController
return Datatable::query($payments)
->addColumn('invoice_number', function ($model) { return $model->invitation_key ? link_to('/view/'.$model->invitation_key, $model->invoice_number)->toHtml() : $model->invoice_number; })
->addColumn('transaction_reference', function ($model) { return $model->transaction_reference ? $model->transaction_reference : '<i>Manual entry</i>'; })
->addColumn('transaction_reference', function ($model) { return $model->transaction_reference ? $model->transaction_reference : '<i>'.trans('texts.manual_entry').'</i>'; })
->addColumn('payment_type', function ($model) { return ($model->payment_type && !$model->last4) ? $model->payment_type : ($model->account_gateway_id ? '<i>Online payment</i>' : ''); })
->addColumn('amount', function ($model) { return Utils::formatMoney($model->amount, $model->currency_id, $model->country_id); })
->addColumn('payment_date', function ($model) { return Utils::dateToString($model->payment_date); })

2
app/Ninja/Datatables/PaymentDatatable.php
View File

@ -43,7 +43,7 @@ class PaymentDatatable extends EntityDatatable
[
'transaction_reference',
function ($model) {
return $model->transaction_reference ? $model->transaction_reference : '<i>Manual entry</i>';
return $model->transaction_reference ? $model->transaction_reference : '<i>'.trans('texts.manual_entry').'</i>';
}
],
[

1
resources/lang/de/texts.php
View File

@ -25,6 +25,7 @@ return array(
'size_id' => 'Firmengröße',
'industry_id' => 'Kategorie',
'private_notes' => 'Notizen',
'manual_entry' => 'Manuelle Eingabe',
// invoice
'invoice' => 'Rechnung',

1
resources/lang/en/texts.php
View File

@ -1360,6 +1360,7 @@ $LANG = array(
'added_on' => 'Added :date',
'failed_remove_payment_method' => 'Failed to remove the payment method',
'gateway_exists' => 'This gateway already exists',
'manual_entry' => 'Manual entry',
);

2
resources/lang/es_ES/texts.php
View File

@ -558,7 +558,7 @@ return array(
'converted' => 'Modificada',
//------Texto extraido -----------------------------------------------------------------------------------------
'<i>Manual entry</i>' => '<i>Entrada Manual</i>',
'manual_entry' => 'Entrada Manual',
// Error
'Whoops, looks like something went wrong.' => 'Vaya, parece que algo salió mal',

1
resources/lang/fr/texts.php
View File

@ -25,6 +25,7 @@ return array(
'size_id' => 'Taille',
'industry_id' => 'Secteur',
'private_notes' => 'Note personnelle',
'manual_entry' => 'Entrée manuel',
// invoice
'invoice' => 'Facture',