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

app/Http/Controllers/ClientPortalController.php

@@ -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); })

app/Ninja/Datatables/PaymentDatatable.php

@@ -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>';
                 }
             ],
             [

resources/lang/de/texts.php

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

resources/lang/en/texts.php

@@ -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',
 
 );
 

resources/lang/es_ES/texts.php

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

resources/lang/fr/texts.php

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