Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-09 20:52:56 +01:00
Code Issues Releases Activity

Bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2016-01-12 11:18:35 +02:00
parent 5dbdec43f3
commit b5cf87bc0d
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/AppController.php
View File

@ -243,6 +243,7 @@ class AppController extends BaseController
try {
Artisan::call('migrate', array('--force' => true));
Artisan::call('db:seed', array('--force' => true, '--class' => 'PaymentLibrariesSeeder'));
Artisan::call('db:seed', array('--force' => true, '--class' => 'FontsSeeder'));
Artisan::call('optimize', array('--force' => true));
Cache::flush();
Session::flush();

3
app/Http/Controllers/InvoiceApiController.php
View File

@ -1,7 +1,6 @@
<?php namespace App\Http\Controllers;
use Auth;
use Illuminate\Support\Facades\Log;
use Utils;
use Response;
use Input;
@ -53,8 +52,6 @@ class InvoiceApiController extends BaseAPIController
$paginator = Invoice::scope();
$invoices = Invoice::scope()
->with(array_merge(['invoice_items'], $this->getIncluded()));
// ->where('invoices.is_quote', '=', false)
// ->where('invoices.is_recurring', '=', false);
if ($clientPublicId = Input::get('client_id')) {
$filter = function($query) use ($clientPublicId) {

2
app/Models/Account.php
View File

@ -36,8 +36,8 @@ class Account extends Eloquent
ACCOUNT_INVOICE_SETTINGS,
ACCOUNT_INVOICE_DESIGN,
ACCOUNT_EMAIL_SETTINGS,
ACCOUNT_CLIENT_PORTAL,
ACCOUNT_TEMPLATES_AND_REMINDERS,
ACCOUNT_CLIENT_PORTAL,
ACCOUNT_CHARTS_AND_REPORTS,
ACCOUNT_DATA_VISUALIZATIONS,
ACCOUNT_USER_MANAGEMENT,

6
resources/views/emails/master.blade.php
View File

@ -3,10 +3,10 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<!--[if !mso]><!-- -->
<link href="{{ $account->getFontsUrl('http') }}" rel="stylesheet" type="text/css" />
<link href="{{ isset($account) ? $account->getFontsUrl('http') : '' }}" rel="stylesheet" type="text/css" />
<!--<![endif]-->
</head>
<body style="min-height: 700px; color: #000000;{!! $account->getBodyFontCss() !!}font-size: 12px; -webkit-text-size-adjust: none; -ms-text-size-adjust: none; background: #F4F5F5; margin: 0; padding: 0;"
<body style="min-height: 700px; color: #000000;{!! isset($account) ? $account->getBodyFontCss() : '' !!}font-size: 12px; -webkit-text-size-adjust: none; -ms-text-size-adjust: none; background: #F4F5F5; margin: 0; padding: 0;"
alink="#FF0000" link="#FF0000" bgcolor="#F4F5F5" text="#000000" yahoo="fix">
@yield('markup')
@ -50,7 +50,7 @@
}
</style>
<div id="body_style" style="min-height: 700px;{!! $account->getBodyFontCss() !!}color: #2E2B2B; font-size: 16px;
<div id="body_style" style="min-height: 700px;{!! isset($account) ? $account->getBodyFontCss() : '' !!};color: #2E2B2B; font-size: 16px;
background: #F4F5F5; padding: 0px 15px;">
<table cellpadding="0" cellspacing="0" border="0" bgcolor="#FFFFFF" width="600" align="center">