Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix for tests

Browse Source
This commit is contained in:
Hillel Coren 2016-12-05 20:56:57 +02:00
parent 2d0effda63
commit 67f44775e3
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/OnlinePaymentController.php
View File

@ -166,7 +166,11 @@ class OnlinePaymentController extends BaseController
return redirect()->to($redirectUrl . $separator . 'invoice_id=' . $invitation->invoice->public_id); return redirect()->to($redirectUrl . $separator . 'invoice_id=' . $invitation->invoice->public_id);
} else { } else {
// Allow redirecting to iFrame for offsite payments // 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);
}
} }
} }

2
resources/views/accounts/import_export.blade.php
View File

@ -85,7 +85,7 @@
@include('partials/checkbox', ['field' => 'vendors']) @include('partials/checkbox', ['field' => 'vendors'])
@include('partials/checkbox', ['field' => 'vendor_contacts']) @include('partials/checkbox', ['field' => 'vendor_contacts'])
</div> </div>
</div> </div><br/>
{!! Former::actions( Button::primary(trans('texts.download'))->submit()->large()->appendIcon(Icon::create('download-alt'))) !!} {!! Former::actions( Button::primary(trans('texts.download'))->submit()->large()->appendIcon(Icon::create('download-alt'))) !!}
</div> </div>