From 67f44775e36f405310e6fe830f7db8eabfe79f73 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Mon, 5 Dec 2016 20:56:57 +0200
Subject: [PATCH] Fix for tests

---
 app/Http/Controllers/OnlinePaymentController.php | 6 +++++-
 resources/views/accounts/import_export.blade.php | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/OnlinePaymentController.php b/app/Http/Controllers/OnlinePaymentController.php
index 61526a616343..b6c9a280cecf 100644
--- a/app/Http/Controllers/OnlinePaymentController.php
+++ b/app/Http/Controllers/OnlinePaymentController.php
@@ -166,7 +166,11 @@ class OnlinePaymentController extends BaseController
             return redirect()->to($redirectUrl . $separator . 'invoice_id=' . $invitation->invoice->public_id);
         } else {
             // Allow redirecting to iFrame for offsite payments
-            return redirect()->to($invitation->getLink('view', ! $isOffsite));
+            if ($isOffsite) {
+                return redirect()->to($invitation->getLink());
+            } else {
+                return redirect()->to('view/' . $invitation->invitation_key);
+            }
         }
     }
 
diff --git a/resources/views/accounts/import_export.blade.php b/resources/views/accounts/import_export.blade.php
index 193214d7d333..a84f9b029377 100644
--- a/resources/views/accounts/import_export.blade.php
+++ b/resources/views/accounts/import_export.blade.php
@@ -85,7 +85,7 @@
                 @include('partials/checkbox', ['field' => 'vendors'])
                 @include('partials/checkbox', ['field' => 'vendor_contacts'])
             </div>
-        </div>
+        </div><br/>
 
         {!! Former::actions( Button::primary(trans('texts.download'))->submit()->large()->appendIcon(Icon::create('download-alt'))) !!}
     </div>