move checks when ordeer is cancelled into same block

ppy · May 10, 2018 · 759a095 · 759a095
1 parent 5ef535f
commit 759a095
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/app/Libraries/Payments/PaymentProcessor.php b/app/Libraries/Payments/PaymentProcessor.php
@@ -217,22 +217,22 @@ public function cancel()
                 $order = $this->getOrder();
                 $payment = $order->payments->where('cancelled', false)->first();
 
-                if ($payment === null && $order->status === 'cancelled') {
-                    // payment not processed, manually cancelled - don't explode
-                    // notify and bail out.
-                    $this->dispatchErrorEvent(
-                        new Exception('Order already cancelled with no existing payment found.'),
-                        $order
-                    );
+                if ($order->status === 'cancelled') {
+                    if ($payment === null) {
+                        // payment not processed, manually cancelled - don't explode
+                        // notify and bail out.
+                        $this->dispatchErrorEvent(
+                            new Exception('Order already cancelled with no existing payment found.'),
+                            $order
+                        );
 
-                    return;
-                }
+                        return;
+                    }
 
-                if ($order->status === 'cancelled') {
                     // check for pre-existing cancelled payment.
                     // Paypal sends multiple notifications that we treat as a cancellation.
-                    $cancelled = $order->payments->where('cancelled', true)->first();
-                    if ($cancelled !== null) {
+                    // If the order is already cancelled and the payment cancelled, skip the rest.
+                    if ($order->payments->where('cancelled', true)->first() !== null) {
                         $this->dispatchErrorEvent(
                             new Exception('Order already cancelled.'),
                             $order