From 54c97a8755c42957560562eb7126d69e98f4a025 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 11 Jun 2022 07:02:24 +1000 Subject: [PATCH] Fixes for GoCardless webhooks --- app/PaymentDrivers/GoCardlessPaymentDriver.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/PaymentDrivers/GoCardlessPaymentDriver.php b/app/PaymentDrivers/GoCardlessPaymentDriver.php index c438924e7d90..d42bf5e74809 100644 --- a/app/PaymentDrivers/GoCardlessPaymentDriver.php +++ b/app/PaymentDrivers/GoCardlessPaymentDriver.php @@ -235,7 +235,7 @@ class GoCardlessPaymentDriver extends BaseDriver nlog("GoCardless Event"); nlog($request->all()); - if(!is_array($request->events) || !is_object($request->events)){ + if(!$request->has("events")){ nlog("No GoCardless events to process in response?"); return response()->json([], 200); @@ -251,12 +251,13 @@ class GoCardlessPaymentDriver extends BaseDriver $payment = Payment::query() ->where('transaction_reference', $event['links']['payment']) - // ->where('company_id', $request->getCompany()->id) + ->where('company_id', $request->getCompany()->id) ->first(); if ($payment) { $payment->status_id = Payment::STATUS_COMPLETED; $payment->save(); + nlog("GoCardless completed"); } else nlog("I was unable to find the payment for this reference"); @@ -268,12 +269,13 @@ class GoCardlessPaymentDriver extends BaseDriver $payment = Payment::query() ->where('transaction_reference', $event['links']['payment']) - // ->where('company_id', $request->getCompany()->id) + ->where('company_id', $request->getCompany()->id) ->first(); if ($payment) { $payment->status_id = Payment::STATUS_FAILED; $payment->save(); + nlog("GoCardless completed"); } } }