diff --git a/app/Filters/QueryFilters.php b/app/Filters/QueryFilters.php index c80c6b85ecd6..ac6318bcf98a 100644 --- a/app/Filters/QueryFilters.php +++ b/app/Filters/QueryFilters.php @@ -176,7 +176,7 @@ abstract class QueryFilters public function is_deleted($value) { - return $this->builder->where('is_deleted', $value); + return $this->builder->where('is_deleted', $value)->withTrashed(); } diff --git a/app/PaymentDrivers/BaseDriver.php b/app/PaymentDrivers/BaseDriver.php index 535546e3fb5c..57a288223532 100644 --- a/app/PaymentDrivers/BaseDriver.php +++ b/app/PaymentDrivers/BaseDriver.php @@ -474,7 +474,7 @@ class BaseDriver extends AbstractPaymentDriver $invoices->first()->invitations->each(function ($invitation) use ($nmo){ - if (!$invitation->contact->trashed() && $invitation->contact->email) { + if (!$invitation->contact->trashed()) { $nmo->to_user = $invitation->contact; NinjaMailerJob::dispatch($nmo); diff --git a/app/PaymentDrivers/Eway/CreditCard.php b/app/PaymentDrivers/Eway/CreditCard.php index 3ef197c948c0..f6c5fc273824 100644 --- a/app/PaymentDrivers/Eway/CreditCard.php +++ b/app/PaymentDrivers/Eway/CreditCard.php @@ -83,8 +83,12 @@ class CreditCard $response_status = ErrorCode::getStatus($response->ResponseMessage); - if(!$response_status['success']) - throw new PaymentFailed($response_status['message'], 400); + if(!$response_status['success']){ + + $this->eway_driver->sendFailureMail($response_status['message']); + + throw new PaymentFailed($response_status['message'], 400); + } //success $cgt = []; @@ -158,6 +162,8 @@ class CreditCard $this->logResponse($response, false); + $this->eway_driver->sendFailureMail($response_status['message']); + throw new PaymentFailed($response_status['message'], 400); } @@ -237,6 +243,8 @@ class CreditCard $this->logResponse($response, false); + $this->eway_driver->sendFailureMail($response_status['message']); + throw new PaymentFailed($response_status['message'], 400); } diff --git a/app/PaymentDrivers/Razorpay/Hosted.php b/app/PaymentDrivers/Razorpay/Hosted.php index efb15074ca9d..657cd4d5d76e 100644 --- a/app/PaymentDrivers/Razorpay/Hosted.php +++ b/app/PaymentDrivers/Razorpay/Hosted.php @@ -105,6 +105,9 @@ class Hosted implements MethodInterface ]); if (! property_exists($this->razorpay->payment_hash->data, 'order_id')) { + + $this->razorpay->sendFailureMail("Missing [order_id] property. "); + throw new PaymentFailed('Missing [order_id] property. Please contact the administrator. Reference: ' . $this->razorpay->payment_hash->hash); } diff --git a/app/PaymentDrivers/Stripe/ACH.php b/app/PaymentDrivers/Stripe/ACH.php index 33fc448a1128..a0568cb8f6ec 100644 --- a/app/PaymentDrivers/Stripe/ACH.php +++ b/app/PaymentDrivers/Stripe/ACH.php @@ -193,7 +193,7 @@ class ACH return $this->processUnsuccessfulPayment($state); } catch (Exception $e) { if ($e instanceof CardException) { - return redirect()->route('client.payment_methods.verification', ['payment_method' => $source->hashed_id, 'method' => GatewayType::BANK_TRANSFER]); + return redirect()->route('client.payment_methods.verification', ['payment_method' => $cgt->hashed_id, 'method' => GatewayType::BANK_TRANSFER]); } throw new PaymentFailed($e->getMessage(), $e->getCode());