From 6539df1f1f938f84542d8674c2596f4b124875ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Thu, 10 Aug 2023 10:52:00 +0300 Subject: [PATCH] close #2985 Fixed : Customer information on Invoices formatted incorrectly --- app/Models/Common/Contact.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Models/Common/Contact.php b/app/Models/Common/Contact.php index 2583f750a..d69b84d6d 100644 --- a/app/Models/Common/Contact.php +++ b/app/Models/Common/Contact.php @@ -270,14 +270,14 @@ class Contact extends Model $location[] = $this->city; } - if ($this->zip_code) { - $location[] = $this->zip_code; - } - if ($this->state) { $location[] = $this->state; } + if ($this->zip_code) { + $location[] = $this->zip_code; + } + if ($this->country && array_key_exists($this->country, trans('countries'))) { $location[] = trans('countries.' . $this->country); }