1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 21:22:58 +01:00

Merge pull request #5681 from turbo124/v5-develop

Fixes for stripe authorize card
This commit is contained in:
David Bomba 2021-05-12 10:13:59 +10:00 committed by GitHub
commit 67f0286333
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions

View File

@ -127,6 +127,8 @@ class InvoiceController extends Controller
$payment_methods = auth()->user()->client->service()->getPaymentMethods($total);
//if there is only one payment method -> lets return straight to the payment page
$data = [
'settings' => auth()->user()->client->getMergedSettings(),
'invoices' => $invoices,
@ -136,8 +138,6 @@ class InvoiceController extends Controller
'total' => $total,
];
// nlog($data);
return $this->render('invoices.payment', $data);
}

View File

@ -407,7 +407,7 @@ class StripePaymentDriver extends BaseDriver
{
try {
$stripe_payment_method = $this->getStripePaymentMethod($payment_method);
$stripe_payment_method->attach(['customer' => $customer->id], $this->stripe_connect_auth);
$stripe_payment_method->attach(['customer' => $customer->id], null, $this->stripe_connect_auth);
} catch (ApiErrorException | Exception $e) {
$this->processInternallyFailedPayment($this, $e);
}
@ -427,7 +427,9 @@ class StripePaymentDriver extends BaseDriver
);
try {
$stripe->paymentMethods->detach($token->token, $this->stripe_connect_auth);
$stripe_payment_method = $this->getStripePaymentMethod($token->token);
$stripe_payment_method->detach($token->token, null, $this->stripe_connect_auth);
//$stripe->paymentMethods->detach($token->token, $this->stripe_connect_auth);
} catch (Exception $e) {
SystemLogger::dispatch([
'server_response' => $e->getMessage(), 'data' => request()->all(),