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

Fixes for mollie webhooks with credit cards

Browse Source
This commit is contained in:
David Bomba 2022-02-20 19:02:57 +11:00
parent 3bad699bfa
commit 0bd0c0d2a1
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/PaymentDrivers/Mollie/CreditCard.php
View File

@ -70,6 +70,12 @@ class CreditCard
'sequenceType' => 'recurring', 'sequenceType' => 'recurring',
'description' => \sprintf('Hash: %s', $this->mollie->payment_hash->hash), 'description' => \sprintf('Hash: %s', $this->mollie->payment_hash->hash),
'webhookUrl' => $this->mollie->company_gateway->webhookUrl(), 'webhookUrl' => $this->mollie->company_gateway->webhookUrl(),
'metadata' => [
'client_id' => $this->mollie->client->hashed_id,
'hash' => $this->mollie->payment_hash->hash,
'gateway_type_id' => GatewayType::CREDIT_CARD,
'payment_type_id' => PaymentType::CREDIT_CARD_OTHER,
],
]); ]);
if ($payment->status === 'paid') { if ($payment->status === 'paid') {
@ -106,6 +112,12 @@ class CreditCard
'hash' => $this->mollie->payment_hash->hash, 'hash' => $this->mollie->payment_hash->hash,
]), ]),
'webhookUrl' => $this->mollie->company_gateway->webhookUrl(), 'webhookUrl' => $this->mollie->company_gateway->webhookUrl(),
'metadata' => [
'client_id' => $this->mollie->client->hashed_id,
'hash' => $this->mollie->payment_hash->hash,
'gateway_type_id' => GatewayType::CREDIT_CARD,
'payment_type_id' => PaymentType::CREDIT_CARD_OTHER,
],
'cardToken' => $request->gateway_response, 'cardToken' => $request->gateway_response,
]; ];

2
app/Providers/MailServiceProvider.php
View File

@ -33,7 +33,7 @@ class MailServiceProvider extends MailProvider
protected function registerIlluminateMailer() protected function registerIlluminateMailer()
{ {
//this is not octane safe
$this->app->singleton('mail.manager', function($app) { $this->app->singleton('mail.manager', function($app) {
return new GmailTransportManager($app); return new GmailTransportManager($app);
}); });

1
app/Providers/NinjaTranslationServiceProvider.php
View File

@ -33,6 +33,7 @@ class NinjaTranslationServiceProvider extends TranslationServiceProvider
* *
*/ */
//this is not octane safe
$this->app->singleton('translator', function ($app) { $this->app->singleton('translator', function ($app) {
$loader = $app['translation.loader']; $loader = $app['translation.loader'];

6
routes/web.php
View File

@ -41,7 +41,7 @@ Route::group(['middleware' => ['url_db']], function () {
Route::get('stripe/signup/{token}', 'StripeConnectController@initialize')->name('stripe_connect.initialization'); Route::get('stripe/signup/{token}', 'StripeConnectController@initialize')->name('stripe_connect.initialization');
Route::get('stripe/completed', 'StripeConnectController@completed')->name('stripe_connect.return'); Route::get('stripe/completed', 'StripeConnectController@completed')->name('stripe_connect.return');
Route::get('checkout/3ds_redirect/{company_key}/{company_gateway_id}/{hash}', 'Gateways\Checkout3dsController@index')->name('checkout.3ds_redirect'); Route::get('checkout/3ds_redirect/{company_key}/{company_gateway_id}/{hash}', 'Gateways\Checkout3dsController@index')->middleware('domain_db')->name('checkout.3ds_redirect');
Route::get('mollie/3ds_redirect/{company_key}/{company_gateway_id}/{hash}', 'Gateways\Mollie3dsController@index')->name('mollie.3ds_redirect'); Route::get('mollie/3ds_redirect/{company_key}/{company_gateway_id}/{hash}', 'Gateways\Mollie3dsController@index')->middleware('domain_db')->name('mollie.3ds_redirect');
Route::get('gocardless/ibp_redirect/{company_key}/{company_gateway_id}/{hash}', 'Gateways\GoCardlessController@ibpRedirect')->name('gocardless.ibp_redirect'); Route::get('gocardless/ibp_redirect/{company_key}/{company_gateway_id}/{hash}', 'Gateways\GoCardlessController@ibpRedirect')->middleware('domain_db')->name('gocardless.ibp_redirect');
Route::get('.well-known/apple-developer-merchantid-domain-association', 'ClientPortal\ApplePayDomainController@showAppleMerchantId'); Route::get('.well-known/apple-developer-merchantid-domain-association', 'ClientPortal\ApplePayDomainController@showAppleMerchantId');