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

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

Browse Source
This commit is contained in:
Hillel Coren 2016-07-20 11:00:19 +03:00
commit 034af87d1b
2 changed files with 465 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

542
app/Libraries/Utils.php
View File

File diff suppressed because it is too large Load Diff

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

@ -30,13 +30,6 @@
</div>
</div>
{!! Former::close() !!}
<!--
<label for="trashed" style="font-weight:normal; margin-left: 10px;">
<input id="trashed" type="checkbox" onclick="setTrashVisible()"
{{ Session::get("show_trash:gateway") ? 'checked' : ''}}/>&nbsp; {{ trans('texts.show_archived_deleted')}} {{ Utils::transFlowText('gateways') }}
</label>
-->
@if ($showAdd)
{!! Button::primary(trans('texts.add_gateway'))