Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-03 23:57:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for mollie webhooks

Browse Source
This commit is contained in:
David Bomba 2021-12-04 22:50:12 +11:00
parent 7adaab984b
commit ceab20b829
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/PaymentDrivers/BaseDriver.php
View File

@ -263,12 +263,13 @@ class BaseDriver extends AbstractPaymentDriver
event('eloquent.created: App\Models\Payment', $payment); event('eloquent.created: App\Models\Payment', $payment);
if ($this->client->getSetting('client_online_payment_notification')) if ($this->client->getSetting('client_online_payment_notification') && in_array($status, [Payment::STATUS_COMPLETED, Payment::STATUS_PENDING
]))
$payment->service()->sendEmail(); $payment->service()->sendEmail();
event(new PaymentWasCreated($payment, $payment->company, Ninja::eventVars())); event(new PaymentWasCreated($payment, $payment->company, Ninja::eventVars()));
if (property_exists($this->payment_hash->data, 'billing_context')) { if (property_exists($this->payment_hash->data, 'billing_context') && $status == Payment::STATUS_COMPLETED) {
$billing_subscription = \App\Models\Subscription::find($this->payment_hash->data->billing_context->subscription_id); $billing_subscription = \App\Models\Subscription::find($this->payment_hash->data->billing_context->subscription_id);
// To access campaign hash => $this->payment_hash->data->billing_context->campaign; // To access campaign hash => $this->payment_hash->data->billing_context->campaign;

5
app/PaymentDrivers/MolliePaymentDriver.php
View File

@ -324,19 +324,18 @@ class MolliePaymentDriver extends BaseDriver
/* Harvest Payment Hash*/ /* Harvest Payment Hash*/
$payment_hash = PaymentHash::where('hash', $payment->metadata->hash)->first(); $payment_hash = PaymentHash::where('hash', $payment->metadata->hash)->first();
$data = [ $data = [
'gateway_type_id' => $payment->metadata->gateway_type_id, 'gateway_type_id' => $payment->metadata->gateway_type_id,
'amount' => $amount = array_sum(array_column($payment_hash->invoices(), 'amount')) + $payment_hash->fee_total, 'amount' => $amount = array_sum(array_column($payment_hash->invoices(), 'amount')) + $payment_hash->fee_total,
'payment_type' => $payment->metadata->payment_type_id, 'payment_type' => $payment->metadata->payment_type_id,
'transaction_reference' => $payment->id, 'transaction_reference' => $payment->id,
]; ];
$record = $this->createPayment( $record = $this->createPayment(
$data, $data,
$codes[$payment->status] $codes[$payment->status]
); );
} }
} }