Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-04 07:57:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Adjust module settings

Browse Source
This commit is contained in:
Hillel Coren 2017-12-20 13:05:46 +02:00
parent 8813dc2323
commit c34f585e5e
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Libraries/Utils.php
View File

@ -96,7 +96,7 @@ class Utils
public static function requireHTTPS() public static function requireHTTPS()
{ {
if (Request::root() === 'http://ninja.dev' || Request::root() === 'http://ninja.dev:8000') { if (in_array(Request::root(), ['http://ninja.dev', 'http://ninja.dev:8000', 'http://www.ninja.test'])) {
return false; return false;
} }

4
app/Models/Account.php
View File

@ -1045,9 +1045,8 @@ class Account extends Eloquent
// Pro // Pro
case FEATURE_TASKS: case FEATURE_TASKS:
case FEATURE_EXPENSES: case FEATURE_EXPENSES:
if (Utils::isNinja() && $this->company_id < EXTRAS_GRANDFATHER_COMPANY_ID) { case FEATURE_QUOTES:
return true; return true;
}
case FEATURE_CUSTOMIZE_INVOICE_DESIGN: case FEATURE_CUSTOMIZE_INVOICE_DESIGN:
case FEATURE_DIFFERENT_DESIGNS: case FEATURE_DIFFERENT_DESIGNS:
@ -1056,7 +1055,6 @@ class Account extends Eloquent
case FEATURE_CUSTOM_EMAILS: case FEATURE_CUSTOM_EMAILS:
case FEATURE_PDF_ATTACHMENT: case FEATURE_PDF_ATTACHMENT:
case FEATURE_MORE_INVOICE_DESIGNS: case FEATURE_MORE_INVOICE_DESIGNS:
case FEATURE_QUOTES:
case FEATURE_REPORTS: case FEATURE_REPORTS:
case FEATURE_BUY_NOW_BUTTONS: case FEATURE_BUY_NOW_BUTTONS:
case FEATURE_API: case FEATURE_API:

2
resources/views/partials/navigation_option.blade.php
View File

@ -22,7 +22,7 @@
class="nav-link {{ Request::is("{$option}*") ? 'active' : '' }}"> class="nav-link {{ Request::is("{$option}*") ? 'active' : '' }}">
<i class="fa fa-{{ empty($icon) ? \App\Models\EntityModel::getIcon($option) : $icon }}" style="width:46px; padding-right:10px"></i> <i class="fa fa-{{ empty($icon) ? \App\Models\EntityModel::getIcon($option) : $icon }}" style="width:46px; padding-right:10px"></i>
{{ ($option == 'recurring_invoices') ? trans('texts.recurring') : mtrans($option) }} {{ ($option == 'recurring_invoices') ? trans('texts.recurring') : mtrans($option) }}
{!! Utils::isTrial() && in_array($option, ['quotes', 'tasks', 'expenses', 'vendors', 'reports']) ? '&nbsp;<sup>' . trans('texts.pro') . '</sup>' : '' !!} {!! Utils::isTrial() && in_array($option, ['reports']) ? '&nbsp;<sup>' . trans('texts.pro') . '</sup>' : '' !!}
</a> </a>
</li> </li>

6
resources/views/reports/report_builder.blade.php
View File

@ -452,6 +452,9 @@
}); });
$('#format').change(function() { $('#format').change(function() {
@if (! auth()->user()->hasFeature(FEATURE_REPORTS))
return;
@endif
var val = $('#format').val(); var val = $('#format').val();
$('#scheduleButton').prop('disabled', val == 'zip'); $('#scheduleButton').prop('disabled', val == 'zip');
if (isStorageSupported() && val != 'zip') { if (isStorageSupported() && val != 'zip') {
@ -460,6 +463,9 @@
}); });
$('#report_type').change(function() { $('#report_type').change(function() {
@if (! auth()->user()->hasFeature(FEATURE_REPORTS))
return;
@endif
var val = $('#report_type').val(); var val = $('#report_type').val();
setFiltersShown(); setFiltersShown();
setDocumentZipShown(); setDocumentZipShown();