Merge remote-tracking branch 'origin/7.x'

Author: duncanmcclean

docs/installation.md

@@ -2,6 +2,10 @@
 title: Installation
 ---
 
+:::note
+[Cargo](https://builtwithcargo.dev), the successor to Simple Commerce, is now in alpha and will be released fully in the next couple of months. If you're starting a new project, you should probably use Cargo instead. To learn more, check out the [Cargo documentation](https://builtwithcargo.dev).
+:::
+
 To install Simple Commerce, there's two routes you can take. You can either [install into an existing site](#content-installing-into-an-existing-site) or create a fresh Statamic project using the Simple Commerce [starter kit](#content-installing-with-the-starter-kit).
 
 ## Requirements

src/Gateways/Builtin/StripeGateway.php

@@ -76,7 +76,6 @@ public function prepare(Request $request, OrderContract $order): array
         if ($this->inPaymentElementsMode()) {
             $intentData['automatic_payment_methods'] = [
                 'enabled' => true,
-                'allow_redirects' => 'never',
             ];
         }
 

src/Http/Controllers/GatewayCallbackController.php

@@ -18,11 +18,9 @@ class GatewayCallbackController extends BaseActionController
 
     public function index(Request $request, $gateway)
     {
-        if ($request->has('_order_id')) {
-            $order = Order::find($request->get('_order_id'));
-        } else {
-            $order = $this->getCart();
-        }
+        $order = $request->has('_order_id')
+            ? Order::find($request->get('_order_id'))
+            : $this->getCart();
 
         $gatewayName = $gateway;
 
@@ -40,11 +38,15 @@ public function index(Request $request, $gateway)
             $callbackSuccess = $order->paymentStatus() === PaymentStatus::Paid;
         }
 
+        $order->fresh();
+
         if (! $callbackSuccess) {
             return $this->withErrors($request, "Order [{$order->get('title')}] has not been marked as paid yet.");
         }
 
-        $order->status(OrderStatus::Placed)->save();
+        if ($order->status() !== OrderStatus::Placed) {
+            $order->status(OrderStatus::Placed)->save();
+        }
 
         $this->forgetCart();
 

src/Tags/CheckoutTags.php

@@ -34,13 +34,13 @@ public function index()
                     return true;
                 })
                 ->each(function ($gateway) use (&$cart, &$data) {
-                    $config = Gateway::use($gateway['handle'])->config();
-                    $prepare = Gateway::use($gateway['handle'])->prepare(request(), $cart);
-
-                    $callbackUrl = Gateway::use($gateway['handle'])
+                    $gatewayInstance = Gateway::use($gateway['handle'])
                         ->withRedirectUrl($this->params->get('redirect') ?? request()->path())
-                        ->withErrorRedirectUrl($this->params->get('error_redirect') ?? request()->path())
-                        ->callbackUrl();
+                        ->withErrorRedirectUrl($this->params->get('error_redirect') ?? request()->path());
+
+                    $config = $gatewayInstance->config();
+                    $prepare = $gatewayInstance->prepare(request(), $cart);
+                    $callbackUrl = $gatewayInstance->callbackUrl();
 
                     $data[$gateway['handle']] = array_merge($prepare, [
                         'config' => $config,