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

Added gateway fee help tooltip

Browse Source
This commit is contained in:
Hillel Coren 2017-07-31 19:56:04 +03:00
parent 94de590af2
commit 098151bff0
8 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Ninja/Presenters/InvoicePresenter.php
View File

@ -285,7 +285,11 @@ class InvoicePresenter extends EntityPresenter
$label = trans('texts.fee'); $label = trans('texts.fee');
} }
return ' - ' . $fee . ' ' . $label; $label = ' - ' . $fee . ' ' . $label;
$label .= '&nbsp;&nbsp; <i class="fa fa-info-circle" data-toggle="tooltip" data-placement="bottom" title="' . trans('texts.fee_help') . '"></i>';
return $label;
} }
public function multiAccountLink() public function multiAccountLink()

2
public/css/built.public.css vendored
View File

File diff suppressed because one or more lines are too long

2
public/css/built.public.css.map
View File

File diff suppressed because one or more lines are too long

4
resources/assets/css/public.style.css vendored
View File

@ -287,3 +287,7 @@ fieldset[disabled] .btn-success.active {
.btn-success .badge { .btn-success .badge {
color: #5cb85c; color: #5cb85c;
} }
.tooltip-inner {
white-space: normal;
}

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

@ -2391,6 +2391,7 @@ $LANG = array(
'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.', 'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
'tax1' => 'First Tax', 'tax1' => 'First Tax',
'tax2' => 'Second Tax', 'tax2' => 'Second Tax',
'fee_help' => 'Gateway fees are the costs charged for access to the financial networks that handle the processing of online payments.',
); );

2
resources/views/header.blade.php
View File

@ -190,8 +190,6 @@
} }
}); });
$('[data-toggle="tooltip"]').tooltip();
// set timeout onDomReady // set timeout onDomReady
setTimeout(delayedFragmentTargetOffset, 500); setTimeout(delayedFragmentTargetOffset, 500);

2
resources/views/invoices/view.blade.php
View File

@ -128,7 +128,7 @@
@if (count($paymentTypes) > 1) @if (count($paymentTypes) > 1)
{!! DropdownButton::success(trans('texts.pay_now'))->withContents($paymentTypes)->large() !!} {!! DropdownButton::success(trans('texts.pay_now'))->withContents($paymentTypes)->large() !!}
@elseif (count($paymentTypes) == 1) @elseif (count($paymentTypes) == 1)
<a href='{!! $paymentURL !!}' class="btn btn-success btn-lg">{{ trans('texts.pay_now') }} {{ $invoice->present()->gatewayFee($gatewayTypeId) }}</a> <a href='{!! $paymentURL !!}' class="btn btn-success btn-lg">{{ trans('texts.pay_now') }} {!! $invoice->present()->gatewayFee($gatewayTypeId) !!}</a>
@endif @endif
@else @else
{!! Button::normal(trans('texts.download_pdf'))->withAttributes(['onclick' => 'onDownloadClick()'])->large() !!} {!! Button::normal(trans('texts.download_pdf'))->withAttributes(['onclick' => 'onDownloadClick()'])->large() !!}

2
resources/views/master.blade.php
View File

@ -268,6 +268,8 @@
@endif @endif
@endif @endif
$('[data-toggle="tooltip"]').tooltip();
@if (Session::has('onReady')) @if (Session::has('onReady'))
{{ Session::get('onReady') }} {{ Session::get('onReady') }}
@endif @endif