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

V2 (#3433)

Browse Source 
* remove jobs table

* Working on notifications

* Working on notifications

* Fix for pdf_variables

* Fixes for notification

* Fixes for viewing invoice with NO company custom_fields

* Fixes for company settings object creation

* Working on group settings

* Fixes for storing the correct currency_id on client creation

* Fix for invoicetransformer

* fix for store client
This commit is contained in:
David Bomba 2020-03-06 18:50:42 +11:00 committed by GitHub
parent 6d33a1a4c8
commit 30e09585ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Designs/Modern.php
View File

@ -38,20 +38,20 @@ class Modern extends AbstractDesign
@media screen { @media screen {
div.div_header { div.div_header {
display: none; display: flex;
} }
div.div_footer { div.div_footer {
display: none; display: flex;
} }
} }
@media print { @media print {
div.div_footer { div.div_footer {
display: block; display: flex;
position: running(footer); position: running(footer);
width: 100%; width: 100%;
} }
div.div_header { div.div_header {
display: block; display: flex;
position: running(header); position: running(header);
width:100%; width:100%;
} }

6
app/Http/Requests/Client/StoreClientRequest.php
View File

@ -84,10 +84,10 @@ class StoreClientRequest extends Request
$settings->{$key} = $value; $settings->{$key} = $value;
} }
} }
//is no settings->currency_id is set then lets dive in and find either a group or company currency all the below may be redundant!! //is no settings->currency_id is set then lets dive in and find either a group or company currency all the below may be redundant!!
if(!property_exists('currency_id', $input['settings']) && isset($input['group_settings_id'])) if(!property_exists($settings, 'currency_id') && isset($input['group_settings_id']))
{ {
$input['group_settings_id'] = $this->decodePrimaryKey($input['group_settings_id']); $input['group_settings_id'] = $this->decodePrimaryKey($input['group_settings_id']);
@ -99,7 +99,7 @@ class StoreClientRequest extends Request
$settings->currency_id = (string)auth()->user()->company()->settings->currency_id; $settings->currency_id = (string)auth()->user()->company()->settings->currency_id;
} }
elseif(!property_exists('currency_id', $input['settings'])) elseif(!property_exists($settings, 'currency_id'))
{ {
$settings->currency_id = (string)auth()->user()->company()->settings->currency_id; $settings->currency_id = (string)auth()->user()->company()->settings->currency_id;
} }

78
tests/MockAccountData.php
View File

@ -399,45 +399,45 @@ trait MockAccountData
$item->cost =10; $item->cost =10;
$line_items[] = $item; $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
$line_items[] = $item; // $line_items[] = $item;
return $line_items; return $line_items;