Merge pull request #12061 from notbakaneko/feature/xsolla-redirect-just-redirect

Show more accurate order state message after xsolla redirect

Author: nanaya

app/Http/Controllers/Payments/XsollaController.php

@@ -7,7 +7,6 @@
 
 use App\Exceptions\InvalidSignatureException;
 use App\Exceptions\Store\OrderException;
-use App\Libraries\OrderCheckout;
 use App\Libraries\Payments\XsollaPaymentProcessor;
 use App\Libraries\Payments\XsollaSignature;
 use App\Libraries\Payments\XsollaUserNotFoundException;
@@ -106,9 +105,9 @@ public function callback(HttpRequest $request)
     public function completed()
     {
         $orderNumber = Request::input('foreignInvoice') ?? '';
-        $order = OrderCheckout::for($orderNumber)->completeCheckout();
+        $order = Order::whereOrderNumber($orderNumber)->firstOrFail();
 
-        return redirect(route('store.invoice.show', ['invoice' => $order->order_id, 'thanks' => 1]));
+        return redirect(route('store.invoice.show', ['invoice' => $order->getKey(), 'thanks' => 1]));
     }
 
     private function errorResponse(string $message, string $code, int $status)