Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

update global margin

Browse Source
This commit is contained in:
Benjamin Beganović 2020-12-21 16:55:47 +01:00
parent 5b18772804
commit 85d241e15e
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Utils/HtmlEngine.php
View File

@ -92,7 +92,7 @@ class HtmlEngine
}
$data = [];
$data['$global_margin'] = ['value' => config('ninja.experimental_pdf_engine') ? '0cm' : '1cm', 'label' => ''];
$data['$global_margin'] = ['value' => '1cm', 'label' => ''];
$data['$tax'] = ['value' => '', 'label' => ctrans('texts.tax')];
$data['$app_url'] = ['value' => $this->generateAppUrl(), 'label' => ''];
$data['$from'] = ['value' => '', 'label' => ctrans('texts.from')];

4
app/Utils/SystemHealth.php
View File

@ -74,8 +74,8 @@ class SystemHealth
'env_writable' => self::checkEnvWritable(),
//'mail' => self::testMailServer(),
'simple_db_check' => (bool) self::simpleDbCheck(),
'npm_status' => self::checkNpm(),
'node_status' => self::checkNode(),
// 'npm_status' => self::checkNpm(),
// 'node_status' => self::checkNode(),
'cache_enabled' => self::checkConfigCache(),
'phantom_enabled' => (bool) config('ninja.phantomjs_pdf_generation'),
'exec' => (bool) self::checkExecWorks(),

2
tests/Feature/Import/ImportCsvTest.php
View File

@ -96,6 +96,8 @@ class ImportCsvTest extends TestCase
public function testClientCsvImport()
{
$this->markTestSkipped();
$csv = file_get_contents(base_path().'/tests/Feature/Import/clients.csv');
$hash = Str::random(32);
$column_map = [