Merge pull request #3 from niels-nijens/change-capture-successful-when-already-captured

Change an unsuccessful capture to successful when all payments are already captured

Author: niels-nijens

src/Message/CaptureRequest.php

@@ -54,6 +54,7 @@ protected function runTransaction(SoapClient $soapClient, array $data): stdClass
         unset($data['paymentOrderKey']);
 
         $captureResponse = $soapClient->__soapCall('capture', [$data]);
+        $this->modifyCaptureResponseToSuccessfulWhenAlreadyCaptured($captureResponse, $statusResponse);
 
         return $this->mergeResponses($statusResponse, $captureResponse);
     }
@@ -116,6 +117,38 @@ private function isPaymentCaptured(stdClass $payment): bool
         return isset($payment->authorization->capture);
     }
 
+    /**
+     * Modifies a erroneous capture response to successful when the payments are already captured.
+     *
+     * This is required to facilitate the same workflow for both directly captured payment methods (like iDeal)
+     * and delayed captured payment methods (like ELV).
+     *
+     * @param stdClass $captureResponse
+     * @param stdClass $statusResponse
+     */
+    private function modifyCaptureResponseToSuccessfulWhenAlreadyCaptured(
+        stdClass $captureResponse,
+        stdClass $statusResponse
+    ): void {
+        if (isset($captureResponse->captureSuccess)) {
+            return;
+        }
+
+        if (isset($statusResponse->statusSuccess) === false) {
+            return;
+        }
+
+        $statusResponseApproximateTotals = $statusResponse->statusSuccess->report->approximateTotals;
+        if ($statusResponseApproximateTotals->totalRegistered !== $statusResponseApproximateTotals->totalCaptured) {
+            return;
+        }
+
+        $captureResponse->captureSuccess = new stdClass();
+        $captureResponse->captureSuccess->success = new stdClass();
+        $captureResponse->captureSuccess->success->code = 'SUCCESS';
+        $captureResponse->captureSuccess->success->_ = $captureResponse->captureErrors->error->_;
+    }
+
     /**
      * Returns an stdClass with the multiple responses.
      *

tests/Message/CaptureRequestTest.php

@@ -237,13 +237,12 @@ public function testSendNotSuccessfulCaptureWhenStatusRequestFails(): void
 
     /**
      * Tests if {@see CaptureRequest::send} returns an unsuccessful {@see CaptureResponse} when trying to capture
-     * an already captured payment.
+     * an incorrect payment ID.
      *
      * @depends testSendSuccessfulCapture
      */
     public function testSendNotSuccessfulCaptureWhenPaymentIdIncorrect(): void
     {
-        $this->markTestIncomplete();
         $this->soapClientMock->expects($this->exactly(2))
             ->method('__soapCall')
             ->withConsecutive(
@@ -290,12 +289,12 @@ public function testSendNotSuccessfulCaptureWhenPaymentIdIncorrect(): void
     }
 
     /**
-     * Tests if {@see CaptureRequest::send} returns an unsuccessful {@see CaptureResponse} when trying to capture
+     * Tests if {@see CaptureRequest::send} returns a successful {@see CaptureResponse} when trying to capture
      * an already captured payment.
      *
      * @depends testSendSuccessfulCapture
      */
-    public function testSendNotSuccessfulCaptureWhenAlreadyCaptured(): void
+    public function testSendSuccessfulCaptureWhenAlreadyCaptured(): void
     {
         $this->soapClientMock->expects($this->exactly(2))
             ->method('__soapCall')
@@ -334,9 +333,14 @@ public function testSendNotSuccessfulCaptureWhenAlreadyCaptured(): void
 
         $response = $this->request->send();
 
-        $this->assertFalse($response->isSuccessful());
+        $this->assertTrue($response->isSuccessful());
+        $this->assertSame('No amount authorized available to capture.', $response->getMessage());
 
         $expectedData = $this->createCaptureAlreadyCapturedErrorResponse();
+        $expectedData->captureSuccess = new stdClass();
+        $expectedData->captureSuccess->success = new stdClass();
+        $expectedData->captureSuccess->success->code = 'SUCCESS';
+        $expectedData->captureSuccess->success->_ = 'No amount authorized available to capture.';
         $expectedData->statusSuccess = $this->createStatusSuccessResponseWithAlreadyCapturedPayment()->statusSuccess;
 
         $this->assertEquals($expectedData, $response->getData());