From e55e9977d46a7ebed46a02bd58e5de532ad7c1a5 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 15 Apr 2018 22:29:20 +0300
Subject: [PATCH] Merge "Buy now" button "Payment" landing page does not work
 with iframe client portal

---
 app/Models/Traits/Inviteable.php                 | 2 +-
 resources/views/accounts/client_portal.blade.php | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/Models/Traits/Inviteable.php b/app/Models/Traits/Inviteable.php
index 098c65cf5fe5..d1411d1becf8 100644
--- a/app/Models/Traits/Inviteable.php
+++ b/app/Models/Traits/Inviteable.php
@@ -42,7 +42,7 @@ trait Inviteable
             }
 
             if ($iframe_url && ! $forceOnsite) {
-                return "{$iframe_url}?{$this->invitation_key}";
+                return "{$iframe_url}?{$this->invitation_key}/{$type}";
             } elseif ($this->account->subdomain && ! $forcePlain) {
                 $url = Utils::replaceSubdomain($url, $account->subdomain);
             }
diff --git a/resources/views/accounts/client_portal.blade.php b/resources/views/accounts/client_portal.blade.php
index 509273b60aaa..29b5cb65f689 100644
--- a/resources/views/accounts/client_portal.blade.php
+++ b/resources/views/accounts/client_portal.blade.php
@@ -345,11 +345,13 @@
                 <p>{{ trans('texts.iframe_url_help1') }}</p>
                 <pre>&lt;center&gt;
 &lt;iframe id="invoiceIFrame" width="100%" height="1200" style="max-width:1000px"&gt;&lt;/iframe&gt;
-&lt;center&gt;
+&lt;/center&gt;
 &lt;script language="javascript"&gt;
 var iframe = document.getElementById('invoiceIFrame');
-iframe.src = '{{ rtrim(SITE_URL ,'/') }}/view/'
-             + window.location.search.substring(1, 33);
+var search = window.location.search + '//';
+var silent = search.indexOf('silent') > 0;
+var parts = search.replace('?silent=true', '').split('/');
+iframe.src = '{{ rtrim(SITE_URL ,'/') }}/' + parts[1] + '/' + parts[0].substring(1, 33) + '/' + parts[2] + (silent ? '?silent=true' : '');
 &lt;/script&gt;</pre>
                 <p>{{ trans('texts.iframe_url_help2') }}</p>
                 <p><b>{{ trans('texts.iframe_url_help3') }}</b></p>