Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Working on gateway fees

Browse Source
This commit is contained in:
Hillel Coren 2017-03-16 22:56:13 +02:00
parent 0379bb61fa
commit be6c9035aa
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@ class AccountGatewayDatatable extends EntityDatatable
{ {
return [ return [
[ [
'name', 'gateway',
function ($model) { function ($model) {
if ($model->deleted_at) { if ($model->deleted_at) {
return $model->name; return $model->name;

1
app/Ninja/Repositories/AccountGatewayRepository.php
View File

@ -23,6 +23,7 @@ class AccountGatewayRepository extends BaseRepository
'account_gateways.id', 'account_gateways.id',
'account_gateways.public_id', 'account_gateways.public_id',
'gateways.name', 'gateways.name',
'gateways.name as gateway',
'account_gateways.deleted_at', 'account_gateways.deleted_at',
'account_gateways.gateway_id', 'account_gateways.gateway_id',
'accounts.gateway_fee_location'); 'accounts.gateway_fee_location');

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

@ -2416,6 +2416,7 @@ $LANG = array(
'gateway_fees' => 'Gateway Fees', 'gateway_fees' => 'Gateway Fees',
'fees_disabled' => 'Fees are disabled', 'fees_disabled' => 'Fees are disabled',
'gateway_fees_help' => 'Automatically add an online payment surcharge [partial payments are not supported].', 'gateway_fees_help' => 'Automatically add an online payment surcharge [partial payments are not supported].',
'gateway' => 'Gateway',
); );

2
resources/views/accounts/payments.blade.php
View File

@ -49,7 +49,7 @@
{!! Datatable::table() {!! Datatable::table()
->addColumn( ->addColumn(
trans('texts.name'), trans('texts.gateway'),
trans('texts.limits'), trans('texts.limits'),
trans('texts.fees'), trans('texts.fees'),
trans('texts.action')) trans('texts.action'))