More backend issues resolved

app/Actions/Shop/CheckoutService.php

@@ -20,6 +20,7 @@
 use Omnipay\Common\Exception\InvalidCreditCardException;
 use Omnipay\Common\Message\RedirectResponseInterface;
 use Omnipay\Common\Message\ResponseInterface;
+use Omnipay\Dummy\Message\Response as DummyResponse;
 use Omnipay\Mollie\Message\Response\FetchTransactionResponse;
 
 /**
@@ -103,13 +104,21 @@ public function processPayment(Order $order, string $return_url, string $cancel_
 					redirect_url: $redirect_url,
 				);
 			} elseif ($response->isSuccessful()) {
+				if ($response instanceof DummyResponse) {
+					// We need those metadata for later completion
+					$metadata = [];
+					$reference = $response->getTransactionReference();
+					$metadata['transactionReference'] = $reference;
+					Session::put('metadata.' . $order->id, $metadata);
+				}
+
 				// Payment was successful
-				$this->completePayment($order, $response);
+				$order->transaction_id = $response->getTransactionReference();
+				$order->save();
 
 				return new CheckoutDTO(
 					is_success: true,
 					is_redirect: false,
-					redirect_url: $return_url,
 				);
 			} else {
 				// Payment failed
@@ -122,8 +131,6 @@ public function processPayment(Order $order, string $return_url, string $cancel_
 				);
 			}
 		} catch (\Exception|InvalidCreditCardException $e) {
-			// dd($e);
-			// TODO: later do better error management
 			Log::error('Error processing payment: ' . $e->getMessage(), [
 				'order_id' => $order->id,
 				'transaction_id' => $order->transaction_id,

app/Http/Controllers/Shop/CheckoutController.php

@@ -97,16 +97,25 @@ public function process(ProcessRequest $request): CheckoutResource
 			$request->additional_data ?? []
 		);
 
-		// If we have a success directly without redirection mark order as completed
 		if ($result->is_success && !$result->is_redirect) {
-			OrderCompleted::dispatchIf(Configs::getValueAsBool('webshop_auto_fulfill_enabled'), $order->id);
+			// This is a success we now need to complete the order.
+			$order->refresh();
+
+			return new CheckoutResource(
+				is_success: true,
+				is_redirect: false,
+				complete_url: URL::route('shop.checkout.return', ['provider' => $order->provider->value, 'transaction_id' => $order->transaction_id]),
+				message: '',
+				order: OrderResource::fromModel($order),
+			);
 		}
 
 		return new CheckoutResource(
 			is_success: $result->is_success,
 			is_redirect: $result->is_redirect,
 			redirect_url: $result->redirect_url,
 			message: $result->message ?? '',
+			order: OrderResource::fromModel($order),
 		);
 	}
 

app/Http/Requests/Order/MarkAsDeliveredOrderRequest.php

@@ -38,7 +38,8 @@ public function authorize(): bool
 		return count(
 			array_diff(
 				array_column($this->items, 'id'),
-				$this->order->items->pluck('id')->toArray())
+				$this->order->items->pluck('id')->toArray()
+			)
 		) === 0;
 	}
 
@@ -65,7 +66,9 @@ protected function processValidatedValues(array $values, array $files): void
 		/** @var int $order_id */
 		$order_id = intval($values['order_id'] ?? null);
 		$this->order = Order::query()
-			->where('status', '=', PaymentStatusType::COMPLETED)
+			->where(fn ($query) => $query
+				->where('status', '=', PaymentStatusType::COMPLETED)
+				->orWhere('status', '=', PaymentStatusType::CLOSED))
 			->where('id', '=', $order_id)
 			->firstOrFail();
 

app/Http/Resources/Shop/CheckoutResource.php

@@ -20,6 +20,7 @@ public function __construct(
 		public readonly bool $is_success,
 		public readonly bool $is_redirect = false,
 		public readonly ?string $redirect_url = null,
+		public readonly ?string $complete_url = null,
 		public readonly string $message = '',
 		public readonly ?OrderResource $order = null,
 	) {

tests/Unit/Actions/Shop/CheckoutServiceTest.php

@@ -129,7 +129,8 @@ public function testProcessPaymentSuccessfulDirect(): void
 		$this->assertInstanceOf(CheckoutDTO::class, $result);
 		$this->assertTrue($result->is_success);
 		$this->assertFalse($result->is_redirect);
-		$this->assertEquals('https://example.com/return', $result->redirect_url);
+		$this->assertEquals('', $result->message);
+		$this->assertNull($result->redirect_url);
 	}
 
 	/**

tests/Webshop/Checkout/CheckoutFinalizeOrCancelControllerTest.php

@@ -182,12 +182,13 @@ public function testCompleteCheckoutFlow(): void
 			'is_success' => true,
 		]);
 
-		// For DUMMY provider, payment should complete immediately without redirect
-		if (!$process_response->json('is_redirect')) {
-			// Verify order status was updated
-			$this->test_order->refresh();
-			$this->assertEquals(PaymentStatusType::COMPLETED, $this->test_order->status);
-		}
+		// Verify order status was updated
+		$this->test_order->refresh();
+		$this->assertEquals(PaymentStatusType::PROCESSING, $this->test_order->status);
+
+		$response = $this->get('/api/v2/Shop/Checkout/Finalize/Dummy/' . $this->test_order->transaction_id);
+		$this->assertRedirect($response);
+		$response->assertRedirect(route('shop.checkout.complete'));
 	}
 
 	/**

tests/Webshop/OrderManagement/OrderControllerMarkAsDeliveredTest.php

@@ -229,7 +229,7 @@ public function testMarkClosedOrderAsDelivered(): void
 		$response = $this->actingAs($this->admin)
 			->putJson('Shop/Order/' . $this->test_order->id);
 
-		$this->assertNotFound($response);
+		$response->assertNoContent();
 
 		// Verify status wasn't changed
 		$this->assertDatabaseHas('orders', [