From 0772c05e6699126ca732a986e5560e83637e0e99 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 20 Jun 2021 07:55:47 +1000
Subject: [PATCH] Fixes for address presentation for clients

---
 app/Models/Presenters/ClientPresenter.php | 39 +++++++++++++++++------
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/app/Models/Presenters/ClientPresenter.php b/app/Models/Presenters/ClientPresenter.php
index 07593304303f..be0fea30a6c3 100644
--- a/app/Models/Presenters/ClientPresenter.php
+++ b/app/Models/Presenters/ClientPresenter.php
@@ -136,21 +136,40 @@ class ClientPresenter extends EntityPresenter
         return $str;
     }
 
+    // public function getCityState()
+    // {
+    //     $settings = $this->entity->getMergedSettings();
+
+    //     $country = false;
+
+    //     if ($settings->country_id) {
+    //         $country = Country::find($settings->country_id);
+    //     }
+
+    //     $swap = $country && $country->swap_postal_code;
+
+    //     $city = e($settings->city ?: '');
+    //     $state = e($settings->state ?: '');
+    //     $postalCode = e($settings->postal_code ?: '');
+
+    //     if ($city || $state || $postalCode) {
+    //         return $this->cityStateZip($city, $state, $postalCode, $swap);
+    //     } else {
+    //         return false;
+    //     }
+    // }
+
     public function getCityState()
     {
-        $settings = $this->entity->getMergedSettings();
-
-        $country = false;
-
-        if ($settings->country_id) {
-            $country = Country::find($settings->country_id);
-        }
+        $client = $this->entity;
+        
+        $country = $client->country ?: false;
 
         $swap = $country && $country->swap_postal_code;
 
-        $city = e($settings->city ?: '');
-        $state = e($settings->state ?: '');
-        $postalCode = e($settings->postal_code ?: '');
+        $city = e($client->city ?: '');
+        $state = e($client->state ?: '');
+        $postalCode = e($client->postal_code ?: '');
 
         if ($city || $state || $postalCode) {
             return $this->cityStateZip($city, $state, $postalCode, $swap);