From be6c9035aae122721b9cd0716d9a534d13b31d11 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Thu, 16 Mar 2017 22:56:13 +0200 Subject: [PATCH] Working on gateway fees --- app/Ninja/Datatables/AccountGatewayDatatable.php | 2 +- app/Ninja/Repositories/AccountGatewayRepository.php | 1 + resources/lang/en/texts.php | 1 + resources/views/accounts/payments.blade.php | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Ninja/Datatables/AccountGatewayDatatable.php b/app/Ninja/Datatables/AccountGatewayDatatable.php index a9f88408793b..0289915f4e9b 100644 --- a/app/Ninja/Datatables/AccountGatewayDatatable.php +++ b/app/Ninja/Datatables/AccountGatewayDatatable.php @@ -20,7 +20,7 @@ class AccountGatewayDatatable extends EntityDatatable { return [ [ - 'name', + 'gateway', function ($model) { if ($model->deleted_at) { return $model->name; diff --git a/app/Ninja/Repositories/AccountGatewayRepository.php b/app/Ninja/Repositories/AccountGatewayRepository.php index d5efbb19067b..08babd3228b7 100644 --- a/app/Ninja/Repositories/AccountGatewayRepository.php +++ b/app/Ninja/Repositories/AccountGatewayRepository.php @@ -23,6 +23,7 @@ class AccountGatewayRepository extends BaseRepository 'account_gateways.id', 'account_gateways.public_id', 'gateways.name', + 'gateways.name as gateway', 'account_gateways.deleted_at', 'account_gateways.gateway_id', 'accounts.gateway_fee_location'); diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index b53e7e85f479..f0291ae4addf 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -2416,6 +2416,7 @@ $LANG = array( 'gateway_fees' => 'Gateway Fees', 'fees_disabled' => 'Fees are disabled', 'gateway_fees_help' => 'Automatically add an online payment surcharge [partial payments are not supported].', + 'gateway' => 'Gateway', ); diff --git a/resources/views/accounts/payments.blade.php b/resources/views/accounts/payments.blade.php index 66d5d80cf171..1749901f7102 100644 --- a/resources/views/accounts/payments.blade.php +++ b/resources/views/accounts/payments.blade.php @@ -49,7 +49,7 @@ {!! Datatable::table() ->addColumn( - trans('texts.name'), + trans('texts.gateway'), trans('texts.limits'), trans('texts.fees'), trans('texts.action'))