From aefed1f11e06c23a1b83f53f5e3afaf34e7758c6 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 22 Aug 2017 21:19:42 +0300 Subject: [PATCH] Fix buy button when using custom domain #1633 --- app/Ninja/Presenters/AccountPresenter.php | 11 +++++++++-- resources/views/accounts/client_portal.blade.php | 7 ++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/app/Ninja/Presenters/AccountPresenter.php b/app/Ninja/Presenters/AccountPresenter.php index 5cfd0e70dd68..21f662284997 100644 --- a/app/Ninja/Presenters/AccountPresenter.php +++ b/app/Ninja/Presenters/AccountPresenter.php @@ -63,9 +63,16 @@ class AccountPresenter extends Presenter return $currency->code; } - public function clientPortalLink() + public function clientPortalLink($subdomain = false) { - return Domain::getLinkFromId($this->entity->domain_id); + $account = $this->entity; + $url = Domain::getLinkFromId($account->domain_id); + + if ($subdomain && $account->subdomain) { + $url = Utils::replaceSubdomain($url, $account->subdomain); + } + + return $url; } public function industry() diff --git a/resources/views/accounts/client_portal.blade.php b/resources/views/accounts/client_portal.blade.php index 6cd7da575101..0c05b501137e 100644 --- a/resources/views/accounts/client_portal.blade.php +++ b/resources/views/accounts/client_portal.blade.php @@ -425,7 +425,12 @@ iframe.src = '{{ rtrim(SITE_URL ,'/') }}/view/' var link = ''; if (productId) { - var link = '{{ url('/buy_now') }}' + paymentType + + @if (Utils::isNinjaProd()) + var domain = '{{ $account->present()->clientPortalLink(true) }}'; + @else + var domain = '{{ url('/buy_now') }}'; + @endif + var link = domain + paymentType + '?account_key={{ $account->account_key }}' + '&product_id=' + productId;