3524070 reload order for update before saving

Closes #3524070

src/PluginForm/OffsiteRedirect/PaymentOffsiteForm.php

@@ -11,6 +11,7 @@ use Drupal\commerce_2c2p\Event\AlterPaymentParamsEvent;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\commerce_2c2p\Event\Commerce2C2PPaymentEvents;
 use Firebase\JWT\JWT;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Template\Attribute;
 use Drupal\Core\Logger\LoggerChannelTrait;
 
@@ -35,12 +36,20 @@ class PaymentOffsiteForm extends BasePaymentOffsiteForm implements ContainerInje
    */
   protected $eventDispatcher;
 
+  /**
+   * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
   /**
    * {@inheritdoc}
    */
-  public function __construct(ClientInterface $http_client, EventDispatcherInterface $event_dispatcher) {
+  public function __construct(ClientInterface $http_client, EventDispatcherInterface $event_dispatcher, EntityTypeManagerInterface $entity_type_manager) {
     $this->httpClient = $http_client;
     $this->eventDispatcher = $event_dispatcher;
+    $this->entityTypeManager = $entity_type_manager;
   }
 
   /**
@@ -49,7 +58,8 @@ class PaymentOffsiteForm extends BasePaymentOffsiteForm implements ContainerInje
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('http_client'),
-      $container->get('event_dispatcher')
+      $container->get('event_dispatcher'),
+      $container->get('entity_type.manager')
     );
   }
 
@@ -99,6 +109,7 @@ class PaymentOffsiteForm extends BasePaymentOffsiteForm implements ContainerInje
       $pt_res_payload = JWT::decode($pt_res_data['payload'], $configuration['secret_key'], [
         'HS256',
       ]);
+      $order = $this->entityTypeManager->getStorage('commerce_order')->loadForUpdate($order);
       $order->setData('commerce_2c2p_payment_token', $pt_res_payload->paymentToken);
       $order->setData('commerce_2c2p_invoice_no', $invoice_no);
       $order->save();