diff --git a/app/Designs/Modern.php b/app/Designs/Modern.php index df84ccb1c31c..d27d3371c8e9 100644 --- a/app/Designs/Modern.php +++ b/app/Designs/Modern.php @@ -38,20 +38,20 @@ class Modern extends AbstractDesign @media screen { div.div_header { - display: none; + display: flex; } div.div_footer { - display: none; + display: flex; } } @media print { div.div_footer { - display: block; + display: flex; position: running(footer); width: 100%; } div.div_header { - display: block; + display: flex; position: running(header); width:100%; } diff --git a/app/Http/Requests/Client/StoreClientRequest.php b/app/Http/Requests/Client/StoreClientRequest.php index 521839e552aa..c6cf31a00149 100644 --- a/app/Http/Requests/Client/StoreClientRequest.php +++ b/app/Http/Requests/Client/StoreClientRequest.php @@ -84,10 +84,10 @@ class StoreClientRequest extends Request $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!! - 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']); @@ -99,7 +99,7 @@ class StoreClientRequest extends Request $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; } diff --git a/tests/MockAccountData.php b/tests/MockAccountData.php index 1a18e60e05c7..28a3a581c957 100644 --- a/tests/MockAccountData.php +++ b/tests/MockAccountData.php @@ -399,45 +399,45 @@ trait MockAccountData $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; return $line_items;