diff --git a/app/Models/Payment.php b/app/Models/Payment.php index 5516d1d39b88..d32630b89720 100644 --- a/app/Models/Payment.php +++ b/app/Models/Payment.php @@ -522,17 +522,18 @@ class Payment extends BaseModel event(new PaymentWasVoided($this, $this->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null))); } - // public function getLink() - // { - // return route('client.payments.show', $this->hashed_id); - // } - public function getLink() :string { + // if (Ninja::isHosted()) { + // $domain = isset($this->company->portal_domain) ? $this->company->portal_domain : $this->company->domain(); + // } else { + // $domain = config('ninja.app_url'); + // } + if (Ninja::isHosted()) { - $domain = isset($this->company->portal_domain) ? $this->company->portal_domain : $this->company->domain(); + $domain = $this->company->domain(); } else { - $domain = config('ninja.app_url'); + $domain = strlen($this->company->portal_domain) > 5 ? $this->company->portal_domain : config('ninja.app_url'); } return $domain.'/client/payment/'.$this->client->contacts()->first()->contact_key.'/'.$this->hashed_id.'?next=/client/payments/'.$this->hashed_id; diff --git a/app/Utils/Traits/Inviteable.php b/app/Utils/Traits/Inviteable.php index 98584eed484a..ee1cffcca78b 100644 --- a/app/Utils/Traits/Inviteable.php +++ b/app/Utils/Traits/Inviteable.php @@ -101,7 +101,6 @@ trait Inviteable break; case 'iframe': return $domain.'/client/'.$entity_type.'/'.$this->key; - //return $domain . $entity_type .'/'. $this->contact->client->client_hash .'/'. $this->key; break; case 'domain': return $domain.'/client/'.$entity_type.'/'.$this->key; @@ -127,7 +126,6 @@ trait Inviteable break; case 'iframe': return $domain.'/client/'; - //return $domain . $entity_type .'/'. $this->contact->client->client_hash .'/'. $this->key; break; case 'domain': return $domain.'/client/';