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

Store that invoice was authorized in the session #1230

Browse Source
This commit is contained in:
Hillel Coren 2017-01-02 14:47:39 +02:00
parent c2171e5f4f
commit 9b13321a7f
4 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -209,9 +209,13 @@ class ClientPortalController extends BaseController
return RESULT_FAILURE; return RESULT_FAILURE;
} }
$invitation->signature_base64 = Input::get('signature'); if ($signature = Input::get('signature')) {
$invitation->signature_base64 = $signature;
$invitation->signature_date = date_create(); $invitation->signature_date = date_create();
$invitation->save(); $invitation->save();
}
session(['authorized:' . $invitation->invitation_key => true]);
return RESULT_SUCCESS; return RESULT_SUCCESS;
} }

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

@ -77,6 +77,11 @@ class OnlinePaymentController extends BaseController
$invitation = $invitation->load('invoice.client.account.account_gateways.gateway'); $invitation = $invitation->load('invoice.client.account.account_gateways.gateway');
$account = $invitation->account; $account = $invitation->account;
if ($account->requiresAuthorization($invitation->invoice) && ! session('authorized:' . $invitation->invitation_key)) {
return redirect()->to('view/' . $invitation->invitation_key);
}
$account->loadLocalizationSettings($invitation->invoice->client); $account->loadLocalizationSettings($invitation->invoice->client);
if ( ! $gatewayTypeAlias) { if ( ! $gatewayTypeAlias) {

2
app/Models/Account.php
View File

@ -1881,7 +1881,7 @@ class Account extends Eloquent
return $this->enabled_modules & static::$modules[$entityType]; return $this->enabled_modules & static::$modules[$entityType];
} }
public function showAuthenticatePanel($invoice) public function requiresAuthorization($invoice)
{ {
return $this->showAcceptTerms($invoice) || $this->showSignature($invoice); return $this->showAcceptTerms($invoice) || $this->showSignature($invoice);
} }

10
resources/views/invoices/view.blade.php
View File

@ -203,7 +203,7 @@
refreshPDF(); refreshPDF();
@endif @endif
@if ($account->showAuthenticatePanel($invoice)) @if ($account->requiresAuthorization($invoice))
$('#paymentButtons a').on('click', function(e) { $('#paymentButtons a').on('click', function(e) {
e.preventDefault(); e.preventDefault();
window.pendingPaymentHref = $(this).attr('href'); window.pendingPaymentHref = $(this).attr('href');
@ -246,6 +246,9 @@
var data = { var data = {
signature: $('#signature').jSignature('getData', 'svgbase64')[1] signature: $('#signature').jSignature('getData', 'svgbase64')[1]
}; };
@else
var data = false;
@endif
$.ajax({ $.ajax({
url: "{{ URL::to('sign/' . $invitation->invitation_key) }}", url: "{{ URL::to('sign/' . $invitation->invitation_key) }}",
type: 'PUT', type: 'PUT',
@ -254,9 +257,6 @@
redirectToPayment(); redirectToPayment();
} }
}); });
@else
redirectToPayment();
@endif
} }
function redirectToPayment() { function redirectToPayment() {
@ -313,7 +313,7 @@
</div> </div>
@endif @endif
@if ($account->showAuthenticatePanel($invoice)) @if ($account->requiresAuthorization($invoice))
<div class="modal fade" id="authenticationModal" tabindex="-1" role="dialog" aria-labelledby="authenticationModalLabel" aria-hidden="true"> <div class="modal fade" id="authenticationModal" tabindex="-1" role="dialog" aria-labelledby="authenticationModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">