Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 13:12:50 +01:00
Code Issues Releases Activity

Minor updates

Browse Source
This commit is contained in:
David Bomba 2023-11-22 15:11:08 +11:00
parent 8d2ccbbf46
commit 3ce403ad73
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/PreviewController.php
View File

@ -137,9 +137,9 @@ class PreviewController extends BaseController
*/ */
public function show() public function show()
{ {
// if(request()->has('template')) { if(request()->has('template')) {
return $this->template(); return $this->template();
// } }
if (request()->has('entity') && if (request()->has('entity') &&
request()->has('entity_id') && request()->has('entity_id') &&

2
app/Models/Presenters/ClientPresenter.php
View File

@ -103,7 +103,7 @@ class ClientPresenter extends EntityPresenter
if ($cityState = $this->getShippingCityState()) { if ($cityState = $this->getShippingCityState()) {
$str .= e($cityState).'<br/>'; $str .= e($cityState).'<br/>';
} }
if ($country = $client->shipping_country) { if ($country = $client->shipping_country ?? $client->country) {
$str .= e($country->name).'<br/>'; $str .= e($country->name).'<br/>';
} }